From 17c4efdbc73c5494da4d7b960c13a59d0f8684c7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Sun, 24 Sep 2023 07:11:23 +0000 Subject: [PATCH 1/2] sys-kernel/coreos-sources: Update from 6.1.54 to 6.1.55 --- changelog/updates/2023-09-24-linux-6.1.55-update.md | 1 + ...{coreos-kernel-6.1.54.ebuild => coreos-kernel-6.1.55.ebuild} | 0 ...oreos-modules-6.1.54.ebuild => coreos-modules-6.1.55.ebuild} | 0 .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 2 +- ...oreos-sources-6.1.54.ebuild => coreos-sources-6.1.55.ebuild} | 0 5 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/updates/2023-09-24-linux-6.1.55-update.md rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-6.1.54.ebuild => coreos-kernel-6.1.55.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-6.1.54.ebuild => coreos-modules-6.1.55.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-6.1.54.ebuild => coreos-sources-6.1.55.ebuild} (100%) diff --git a/changelog/updates/2023-09-24-linux-6.1.55-update.md b/changelog/updates/2023-09-24-linux-6.1.55-update.md new file mode 100644 index 0000000000..7da5e0fb6a --- /dev/null +++ b/changelog/updates/2023-09-24-linux-6.1.55-update.md @@ -0,0 +1 @@ +- Linux ([6.1.55](https://lwn.net/Articles/945379)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.1.54.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.1.55.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.1.54.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.1.55.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.1.54.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.1.55.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.1.54.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.1.55.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 8c1feb0fc1..fdc844d494 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-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68 -DIST patch-6.1.54.xz 3243564 BLAKE2B 43adfde03d24d2efca18502867a94e8f91fee146b58f3e2397bb62f622fa47f6caec7a4bebd22f007fca66e4c4140244839bd0aefc33591f669eee4b4fde5d54 SHA512 adf488c3d4ef31d011501f91474d9863fc95f402dc2dca5a07a8a9a38101775916d8442962a64e6353152f10e79410bc7a6b2a2eb84e9be993ca2c2334fbb5f9 +DIST patch-6.1.55.xz 3276424 BLAKE2B 56ba9c54e81c5f7cb815c0d25c99bd56572f3f8027263eba1f2cec12fbcb3f9486d2afa77db7efb41ee1e0bee3f74e0c3f4be335573d10f24e4eddf874f465ac SHA512 4d89f2e33b070f461ab76e8c0916e8e2bb3f8f6ed7f19a1cb9ef7f8afa653da151d3233632eb9286c808f6ff457c1d91278387275466dfe8170e5a111d48175f diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.1.54.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.1.55.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.1.54.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.1.55.ebuild From a7e5f1f9031b96a5c1aeeaf89b1668406952f4d4 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 >= 6.1.55 like below, because upstream stable Kernels deleted the Kernel configs CONFIG_NET_CLS_RSVP*. ``` * ERROR: sys-kernel/coreos-modules-6.1.55::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-6.1 | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.1 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.1 index 961add0da3..24c15dc8a4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.1 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.1 @@ -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