From 7d86fafb152d5bb92a82eeeeb009387ffe360232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu@archlinux.org>
Date: Sun, 17 Dec 2023 12:25:56 +0100
Subject: [PATCH] upgpkg: 6.6-1
---
.SRCINFO | 10 ++++----
PKGBUILD | 10 ++++----
fix-perf-tests.patch | 56 --------------------------------------------
3 files changed, 8 insertions(+), 68 deletions(-)
delete mode 100644 fix-perf-tests.patch
diff --git a/.SRCINFO b/.SRCINFO
index 30b6cb0..7582315 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-tools
- pkgver = 6.5
+ pkgver = 6.6
pkgrel = 1
url = https://www.kernel.org
arch = x86_64
@@ -36,8 +36,8 @@ pkgbase = linux-tools
makedepends = clang
options = !strip
options = !lto
- source = git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#tag=v6.5?signed
- source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.5.5.xz
+ source = git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#tag=v6.6?signed
+ source = https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-6.6.7.xz
source = cpupower.default
source = cpupower.systemd
source = cpupower.service
@@ -45,11 +45,10 @@ pkgbase = linux-tools
source = hv_fcopy_daemon.service
source = hv_kvp_daemon.service
source = hv_vss_daemon.service
- source = fix-perf-tests.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = SKIP
- sha256sums = 22ad68c6c5f194f879fded9c44a205e394438fd505439e5f23e13e22ae1b7fe0
+ sha256sums = b227017c1aba9089054a2ca8b6671225de948a6643d7a759558386540f55d1e2
sha256sums = 4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f
sha256sums = b692f4859ed3fd9831a058a450a84d8c409bf7e3e45aac1c2896a14bb83f3d7a
sha256sums = 42d2ec9f1d9cc255ee7945a27301478364ef482f5a6ddfc960189f03725ccec2
@@ -57,7 +56,6 @@ pkgbase = linux-tools
sha256sums = 16855c197d2334f820cb190312a5a7fffe9165189db01344a957e582e39e17d8
sha256sums = b1315cb77a35454e1af9172f821a52e2a0cb18561be05a340d21cf337b01ae61
sha256sums = 2d5e2f8d40b6f19bf2e1dead57ca105d72098fb0b418c09ff2e0cb91089710af
- sha256sums = 26bce106f363fd382b5669c5098c76c127d564da827b254847c7b7e76e39f912
pkgname = bootconfig
pkgdesc = Apply, delete or show boot config to initrd
diff --git a/PKGBUILD b/PKGBUILD
index 1aec1d7..6262dca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ pkgname=(
'usbip'
'x86_energy_perf_policy'
)
-pkgver=6.5
+pkgver=6.6
pkgrel=1
license=('GPL2')
arch=('x86_64')
@@ -41,7 +41,7 @@ makedepends+=('libcap')
makedepends+=('llvm' 'clang')
groups=("$pkgbase")
source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#tag=v${pkgver//_/-}?signed"
- "https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-$pkgver.5.xz"
+ "https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-$pkgver.7.xz"
'cpupower.default'
'cpupower.systemd'
'cpupower.service'
@@ -49,22 +49,20 @@ source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#
'hv_fcopy_daemon.service'
'hv_kvp_daemon.service'
'hv_vss_daemon.service'
- 'fix-perf-tests.patch'
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
sha256sums=('SKIP'
- '22ad68c6c5f194f879fded9c44a205e394438fd505439e5f23e13e22ae1b7fe0'
+ 'b227017c1aba9089054a2ca8b6671225de948a6643d7a759558386540f55d1e2'
'4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
'b692f4859ed3fd9831a058a450a84d8c409bf7e3e45aac1c2896a14bb83f3d7a'
'42d2ec9f1d9cc255ee7945a27301478364ef482f5a6ddfc960189f03725ccec2'
'2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
'16855c197d2334f820cb190312a5a7fffe9165189db01344a957e582e39e17d8'
'b1315cb77a35454e1af9172f821a52e2a0cb18561be05a340d21cf337b01ae61'
- '2d5e2f8d40b6f19bf2e1dead57ca105d72098fb0b418c09ff2e0cb91089710af'
- '26bce106f363fd382b5669c5098c76c127d564da827b254847c7b7e76e39f912')
+ '2d5e2f8d40b6f19bf2e1dead57ca105d72098fb0b418c09ff2e0cb91089710af')
prepare() {
cd linux
diff --git a/fix-perf-tests.patch b/fix-perf-tests.patch
deleted file mode 100644
index a0d29d4..0000000
--- a/fix-perf-tests.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-First noticed on Fedora Rawhide:
-
- tests/bpf.c: In function ‘epoll_pwait_loop’:
- tests/bpf.c:36:17: error: argument 2 null where non-null expected [-Werror=nonnull]
- 36 | epoll_pwait(-(i + 1), NULL, 0, 0, NULL);
- | ^~~~~~~~~~~
- In file included from tests/bpf.c:5:
- /usr/include/sys/epoll.h:134:12: note: in a call to function ‘epoll_pwait’ declared ‘nonnull’
- 134 | extern int epoll_pwait (int __epfd, struct epoll_event *__events,
- | ^~~~~~~~~~~
-
- [perfbuilder@27cfe44d67ed perf-6.5.0-rc2]$ gcc -v
- Using built-in specs.
- COLLECT_GCC=gcc
- COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/13/lto-wrapper
- OFFLOAD_TARGET_NAMES=nvptx-none
- OFFLOAD_TARGET_DEFAULT=1
- Target: x86_64-redhat-linux
- Configured with: ../configure --enable-bootstrap --enable-languages=c,c++,fortran,objc,obj-c++,ada,go,d,m2,lto --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-gcc-major-version-only --enable-libstdcxx-backtrace --with-libstdcxx-zoneinfo=/usr/share/zoneinfo --with-linker-hash-style=gnu --enable-plugin --enable-initfini-array --with-isl=/builddir/build/BUILD/gcc-13.2.1-20230728/obj-x86_64-redhat-linux/isl-install --enable-offload-targets=nvptx-none --without-cuda-driver --enable-offload-defaulted --enable-gnu-indirect-function --enable-cet --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux --with-build-config=bootstrap-lto --enable-link-serialization=1
- Thread model: posix
- Supported LTO compression algorithms: zlib zstd
- gcc version 13.2.1 20230728 (Red Hat 13.2.1-1) (GCC)
- [perfbuilder@27cfe44d67ed perf-6.5.0-rc2]$
-
-Just add that argument to address this compiler warning.
-
-Cc: Adrian Hunter <adrian.hunter@intel.com>
-Cc: Ian Rogers <irogers@google.com>
-Cc: Jiri Olsa <jolsa@kernel.org>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Link: https://lore.kernel.org/lkml/
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
----
- tools/perf/tests/bpf.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
-index 31796f2a80f47fb1..9ccecd873ecdd046 100644
---- a/tools/perf/tests/bpf.c
-+++ b/tools/perf/tests/bpf.c
-@@ -29,11 +29,12 @@
-
- static int epoll_pwait_loop(void)
- {
-+ struct epoll_event events;
- int i;
-
- /* Should fail NR_ITERS times */
- for (i = 0; i < NR_ITERS; i++)
-- epoll_pwait(-(i + 1), NULL, 0, 0, NULL);
-+ epoll_pwait(-(i + 1), &events, 0, 0, NULL);
- return 0;
- }
-
---
-2.37.1
--
GitLab