diff --git a/.gitignore b/.gitignore index b995a95..75f5bd3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ clog kernel-[234].*/ perf-man-*.tar.gz /linux-5.0-rc1.tar.gz +/linux-5.0-rc2.tar.gz diff --git a/0001-tools-uapi-asm-Update-asm-generic-unistd.h.patch b/0001-tools-uapi-asm-Update-asm-generic-unistd.h.patch deleted file mode 100644 index 7110fb7..0000000 --- a/0001-tools-uapi-asm-Update-asm-generic-unistd.h.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2157a16c7e2fb0cac8d94533f2af29f12e52e821 Mon Sep 17 00:00:00 2001 -From: Laura Abbott -Date: Tue, 8 Jan 2019 13:39:36 -0800 -Subject: [PATCH] tools uapi asm: Update asm-generic/unistd.h -Cc: Peter Zijlstra -To: Ingo Molnar -To: Arnaldo Carvalho de Melo -Cc: Alexander Shishkin -Cc: Jiri Olsa -Cc: Namhyung Kim -Cc: linux-kernel@vger.kernel.org -Cc: Arnd Bergmann - -Commit 4e21565b7fd4 ("asm-generic: add kexec_file_load system -call to unistd.h") added the system call to the generic header -but not to the perf copy resulting a compile failure on aarch64 -When running mksyscalltbl - -BUILDSTDERR: : In function 'main': -BUILDSTDERR: :273:44: error: '__NR_kexec_file_load' undeclared (first use in this function) -BUILDSTDERR: :273:44: note: each undeclared identifier is reported only once for each function it appears in - -Fix this by syncing up. - -Fixes: 4e21565b7fd4 ("asm-generic: add kexec_file_load system call to unistd.h") -Signed-off-by: Laura Abbott ---- -Found this on Fedora when compiling 5.0-rc1, I hadn't seen a patch -queued yet. ---- - tools/include/uapi/asm-generic/unistd.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tools/include/uapi/asm-generic/unistd.h b/tools/include/uapi/asm-generic/unistd.h -index c7f3321fbe43..d90127298f12 100644 ---- a/tools/include/uapi/asm-generic/unistd.h -+++ b/tools/include/uapi/asm-generic/unistd.h -@@ -738,9 +738,11 @@ __SYSCALL(__NR_statx, sys_statx) - __SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents) - #define __NR_rseq 293 - __SYSCALL(__NR_rseq, sys_rseq) -+#define __NR_kexec_file_load 294 -+__SYSCALL(__NR_kexec_file_load, sys_kexec_file_load) - - #undef __NR_syscalls --#define __NR_syscalls 294 -+#define __NR_syscalls 295 - - /* - * 32 bit systems traditionally used different --- -2.20.1 - diff --git a/kernel-tools.spec b/kernel-tools.spec index 51794a3..18c38a4 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -32,7 +32,7 @@ %global upstream_sublevel 0 # The rc snapshot level -%global rcrev 1 +%global rcrev 2 # Set rpm version accordingly %global rpmversion 5.%{upstream_sublevel}.0 %endif @@ -87,7 +87,7 @@ BuildRequires: rpm-build, elfutils BuildRequires: systemd # Source0: https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{kversion}.tar.xz -Source0: https://git.kernel.org/torvalds/t/linux-5.0-rc1.tar.gz +Source0: https://git.kernel.org/torvalds/t/linux-5.0-rc2.tar.gz # Sources for kernel-tools Source2000: cpupower.service @@ -115,7 +115,6 @@ Patch1: 0001-perf-Remove-FSF-address.patch Patch3: 0001-tools-include-Sync-vmx.h-header-for-FSF-removal.patch Patch4: 0001-tools-lib-Remove-FSF-address.patch Patch6: 0002-perf-Don-t-make-sourced-script-executable.patch -Patch7: 0001-tools-uapi-asm-Update-asm-generic-unistd.h.patch Name: kernel-tools Summary: Assortment of tools for the Linux kernel License: GPLv2 @@ -198,7 +197,6 @@ cd linux-%{kversion} %patch3 -p1 %patch4 -p1 %patch6 -p1 -%patch7 -p1 # END OF PATCH APPLICATIONS @@ -425,6 +423,9 @@ popd %license linux-%{kversion}/COPYING %changelog +* Mon Jan 14 2019 Laura Abbott - 5.0.0-0.rc2.git0.1 +- Linux v5.0-rc2 + * Thu Jan 10 2019 Miro HronĨok - 5.0.0-0.rc1.git0.2 - Remove Python 2 subpackage diff --git a/sources b/sources index af024b7..361b576 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (linux-5.0-rc1.tar.gz) = acad161b8cd164c2ee63f7bf937655b1618a357be3cf0afa90b987f4697005987bed1a911228d1f77a188f2c008041fe1ac7e5055797abcaf3d8b4a92aef8552 +SHA512 (linux-5.0-rc2.tar.gz) = 93d1d32cadc1d55354cc7706b718f3a6c46abdf635fda8e4a0c34d9fce79a3a2d8ec5d12850f9813cdea7c7236846b95e1db48498ed8c5b425abd36e4801ed81