From 342e40c60064f650374a992b4b65261a5d7abce0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Sat, 2 Mar 2024 07:10:41 +0000 Subject: [PATCH 1/2] sys-kernel/coreos-sources: Update from 5.15.148 to 5.15.150 --- changelog/updates/2024-03-02-linux-5.15.150-update.md | 1 + ...eos-kernel-5.15.148.ebuild => coreos-kernel-5.15.150.ebuild} | 0 ...s-modules-5.15.148.ebuild => coreos-modules-5.15.150.ebuild} | 0 .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 2 +- ...s-sources-5.15.148.ebuild => coreos-sources-5.15.150.ebuild} | 0 5 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/updates/2024-03-02-linux-5.15.150-update.md rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-5.15.148.ebuild => coreos-kernel-5.15.150.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-5.15.148.ebuild => coreos-modules-5.15.150.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-5.15.148.ebuild => coreos-sources-5.15.150.ebuild} (100%) diff --git a/changelog/updates/2024-03-02-linux-5.15.150-update.md b/changelog/updates/2024-03-02-linux-5.15.150-update.md new file mode 100644 index 0000000000..0010376f36 --- /dev/null +++ b/changelog/updates/2024-03-02-linux-5.15.150-update.md @@ -0,0 +1 @@ +- Linux ([5.15.150](https://lwn.net/Articles/964175) (includes [5.15.149](https://lwn.net/Articles/963359))) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.148.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.150.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.148.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.150.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.148.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.150.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.148.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.150.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 9e716d995e..f60f081721 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.148.xz 5244868 BLAKE2B 098bb6ddbd682c0b15bad2f08ad6eefbfca732fafccb23085dd7348570486726e3a1c0b3c74092b6b3ab20f8d9b2cd50b968666b3fceb50f4905a8da371f754e SHA512 22513243c8a40975dd63ef494f41303008b777df6f891101d469670056d504c771139692dfd59decf9d3381bd78f454a066ce78d50e6e2b0c72d2d6e10cda5b7 +DIST patch-5.15.150.xz 5422052 BLAKE2B b937c85a23627af2cbb74f6bdf1c63de78e20f983bbbd79bbb92ce422e02bddb31ff0644c646ebd0469388179a66db139b6fdf1bede63b234d5b8d8161d52eb7 SHA512 7d29921c2f29cca59e526a5cf3f2225048dc0b0c7f45335e2e29f8124f2546a60d6ef1c6fb357906db550b05a71f9ab88387cfdc45174fadbafc50bc6078ef29 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.148.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.150.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.148.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.150.ebuild From 5dcf6a2e6c2eb744360013cbb0730759734aa523 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 4 Mar 2024 15:53:43 +0100 Subject: [PATCH 2/2] overlay sys-kernel/coreos-modules: remove invalid Kernel configs Remove invalid Kernel configs CONFIG_NET_SCH_CBQ and CONFIG_NET_SCH_DSMARK, to fix build issues like: ``` * ERROR: sys-kernel/coreos-modules-5.15.150::coreos failed (configure phase): * Requested options not enabled in build: * CONFIG_NET_SCH_CBQ * CONFIG_NET_SCH_DSMARK ``` See also https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.150&id=78bac52c290a7fc50607d4a91f828f1823a69824, https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.150&id=6e5e93fd51fea74844cb741af15fdc359ea8712e. --- .../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 e55e414fc1..385b7d58b9 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 @@ -590,11 +590,9 @@ CONFIG_NET_KEY=m CONFIG_NET_L3_MASTER_DEV=y # CONFIG_NET_PACKET_ENGINE is not set CONFIG_NET_SCHED=y -CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_DRR=m -CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_FQ=m CONFIG_NET_SCH_FQ_CODEL=m CONFIG_NET_SCH_GRED=m