From 36c6b9250fb60c71e9c4f6149540cd8f90b48b0f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Sun, 24 Sep 2023 07:11:36 +0000 Subject: [PATCH 1/2] sys-kernel/coreos-sources: Update from 5.15.132 to 5.15.133 --- changelog/updates/2023-09-24-linux-5.15.133-update.md | 1 + ...eos-kernel-5.15.132.ebuild => coreos-kernel-5.15.133.ebuild} | 0 ...s-modules-5.15.132.ebuild => coreos-modules-5.15.133.ebuild} | 0 .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 2 +- ...s-sources-5.15.132.ebuild => coreos-sources-5.15.133.ebuild} | 0 5 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/updates/2023-09-24-linux-5.15.133-update.md rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-5.15.132.ebuild => coreos-kernel-5.15.133.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-5.15.132.ebuild => coreos-modules-5.15.133.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-5.15.132.ebuild => coreos-sources-5.15.133.ebuild} (100%) diff --git a/changelog/updates/2023-09-24-linux-5.15.133-update.md b/changelog/updates/2023-09-24-linux-5.15.133-update.md new file mode 100644 index 0000000000..2c97537a8e --- /dev/null +++ b/changelog/updates/2023-09-24-linux-5.15.133-update.md @@ -0,0 +1 @@ +- Linux ([5.15.133](https://lwn.net/Articles/945380)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.132.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.133.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.132.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.133.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.132.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.133.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.132.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.133.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest index 00a3802449..95e7bfd7f5 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest @@ -1,2 +1,2 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a -DIST patch-5.15.132.xz 4758836 BLAKE2B 8ffd1443bb45c412de30ba5b95dcd320f3360a1266e523276a709488b55597b30fe40a2dc36cf0ec1a3be83f505eaf810690084688e759741770331cf54d8dc5 SHA512 4a2001b61976600984a07a845c201758282a1998052800de25dada3973910cf5e6ea2e685849f1202aeb640492a4ae71973b0fbd251ffd2af2afef114e3786d8 +DIST patch-5.15.133.xz 4786988 BLAKE2B 8998194879d82dc1d5f599fc9417c61936b1e0c37aba6277b0cd0e4e61792ab4c2e941fde4b442b5dd2fc302fd26447e2c22da7b81d8ee0631e13fa37eb9acc8 SHA512 c655e7397f7df3c6e130db186b02a1522b2c141119078f94c72f94ed06933921180e411d1e8abe34a7a651c44096e770494b935e57f5d0daf60402a92b6226e9 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.132.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.133.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.132.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.133.ebuild From c1809ba673d4413fa3c84f900cb937a53e6aaec3 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 25 Sep 2023 10:24:15 +0200 Subject: [PATCH 2/2] overlay sys-kernel/coreos-modules: delete configs CONFIG_NET_CLS_RSVP* Build fails in >= 5.15.133 like below, because upstream stable Kernels deleted the Kernel configs CONFIG_NET_CLS_RSVP*. ``` * ERROR: sys-kernel/coreos-modules-5.15.133::coreos failed (configure phase): * Requested options not enabled in build: * CONFIG_NET_CLS_RSVP * CONFIG_NET_CLS_RSVP6 ``` Fix that by deleting the Kernel configs. --- .../sys-kernel/coreos-modules/files/commonconfig-5.15 | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15 index cac008e737..d2f92e108b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15 @@ -573,8 +573,6 @@ CONFIG_NET_CLS_CGROUP=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_U32=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_CMP=m