From 8f5411b63fc32f5e8a2ddc0067edd732182c6172 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 20 Oct 2020 18:25:23 +0200 Subject: [PATCH 1/4] sys-kernel/coreos-sources: Regenerate patches against 5.9.1 --- ...erive-relative-path-for-srctree-from-CURDIR.patch | 12 ++++++------ ...tool-Makefile-Don-t-fail-on-fallthrough-wit.patch | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.8/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.8/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch index 3e801ba974..809d53fbc6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.8/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.8/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch @@ -1,4 +1,4 @@ -From b500ac62a04f6aede02e0ca8c9a4228b0ffc2828 Mon Sep 17 00:00:00 2001 +From 2a4e8c743f97578d3db28c8f0446d8f99e0da3fd Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 Subject: [PATCH 1/2] kbuild: derive relative path for srctree from CURDIR @@ -12,13 +12,13 @@ by some undesirable path component. 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 36eab48d1d4a..0514c0fa114d 100644 +index d600b38144f4..846089783807 100644 --- a/Makefile +++ b/Makefile -@@ -230,8 +230,10 @@ else +@@ -239,8 +239,10 @@ else building_out_of_srctree := 1 endif - + -ifneq ($(KBUILD_ABS_SRCTREE),) -srctree := $(abs_srctree) +ifneq ($(KBUILD_OUTPUT),) @@ -26,8 +26,8 @@ index 36eab48d1d4a..0514c0fa114d 100644 +else + srctree := $(abs_srctree) endif - + objtree := . --- +-- 2.26.2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.8/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.8/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch index 50d18689dd..45ad27e6e4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.8/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.8/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -1,4 +1,4 @@ -From d2559ba1a806f8d010d09807c2c0906181824626 Mon Sep 17 00:00:00 2001 +From bb5ea0a6a4a0b7a1a361c8c5dea29628c8e01135 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 21:23:12 -0500 Subject: [PATCH 2/2] tools/objtool/Makefile: Don't fail on fallthrough with From 86a2e229cf463018c1f4b7df8749a0342b4535ce Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 20 Oct 2020 18:37:29 +0200 Subject: [PATCH 2/4] sys-kernel/*: Bump to 5.9.1 --- ...coreos-kernel-5.8.16.ebuild => coreos-kernel-5.9.1.ebuild} | 0 ...reos-modules-5.8.16.ebuild => coreos-modules-5.9.1.ebuild} | 0 .../files/{amd64_defconfig-5.8 => amd64_defconfig-5.9} | 0 .../files/{arm64_defconfig-5.8 => arm64_defconfig-5.9} | 0 .../files/{commonconfig-5.8 => commonconfig-5.9} | 0 .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 4 ++-- ...reos-sources-5.8.16.ebuild => coreos-sources-5.9.1.ebuild} | 2 +- ...-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch | 0 ...tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch | 0 9 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-5.8.16.ebuild => coreos-kernel-5.9.1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-5.8.16.ebuild => coreos-modules-5.9.1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/{amd64_defconfig-5.8 => amd64_defconfig-5.9} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/{arm64_defconfig-5.8 => arm64_defconfig-5.9} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/{commonconfig-5.8 => commonconfig-5.9} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-5.8.16.ebuild => coreos-sources-5.9.1.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/{5.8 => 5.9}/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/{5.8 => 5.9}/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.8.16.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.9.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.8.16.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.9.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.8.16.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.9.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.8.16.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.9.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.8 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.9 similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.8 rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.9 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-5.8 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-5.9 similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-5.8 rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-5.9 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.8 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.9 similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.8 rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.9 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 21511c16ca..9cfacfdd07 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.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556 -DIST patch-5.8.16.xz 574536 BLAKE2B 03756e7ca40fa540a2a0ce81613781b1f2cfd65991a38618a362c6a599d8450ed0ab1331b797ccf529b56f504ee6ead4a120ef8cd1497832c1d5a1bf54c429cb SHA512 b9f00c9aa0998e1db72ef2f3301c0082ec21e6d439394ea61876312634713ece2ca9ecce70a00af0c618dc6acbae4efb7a1b75df4d4564a672e6b8439ef13f97 +DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca +DIST patch-5.9.1.xz 5652 BLAKE2B 02daa4610b58b5af726b84788702ece2db278c8f2afc0e2de11c465d5e827e745cbb952fc3f55074833d8cf31b4d05f5ae1b2a4ae324b171950090fbc712e3de SHA512 0e0738df04d306c141ac950f0ff95eaea06c65024a30b4f1e3b5f3867b5b022b3ed36898302c26046d1ec1567eb314474fcb2a6aac6d4bcd79d3ba9266d9e244 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.8.16.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.9.1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.8.16.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.9.1.ebuild index 3d782ccffa..d4e6d60b41 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.8.16.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.9.1.ebuild @@ -8,7 +8,7 @@ ETYPE="sources" # Final releases should be versioned L.M.N, even for N == 0 # Only needed for RCs -K_BASE_VER="5.8" +K_BASE_VER="5.9" inherit kernel-2 EXTRAVERSION="-flatcar" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.8/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.9/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.8/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.9/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.8/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.9/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.8/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.9/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch From 38798dac1fab6cae7fff892eae4a2c2d31e1d27f Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 20 Oct 2020 18:41:50 +0200 Subject: [PATCH 3/4] sys-kernel/coreos-firmware: Update to 20200918 --- .../coreos-overlay/sys-kernel/coreos-firmware/Manifest | 2 +- ...firmware-20200817.ebuild => coreos-firmware-20200918.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/{coreos-firmware-20200817.ebuild => coreos-firmware-20200918.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/Manifest index 7e1756c4ed..28ed61fb29 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/Manifest @@ -1 +1 @@ -DIST linux-firmware-20200817.tar.xz 121401548 BLAKE2B 77a9ddbab368994801c5f834b65e0c991798eb5ecaeecb84a5b69e886f7aae6e6186f60ebdd4f18449ffe639fb8230c3db108151026161ab23740da63be928a2 SHA512 dba347534d1b51ebcc55600c05293fad5f04f0bfdaec80b2ba27b40a9a20eb5c8bd76cb29d8ca6c814b067952cba4ee3fdb903510a171df98959d592b2c00c13 +DIST linux-firmware-20200918.tar.xz 124581736 BLAKE2B 1541e1afcf52dfb03e89a1d2960b447b9a7e056267eea71ca468c85a69a777ac8686500acd1d65d30943ef82ad64c64c9b29773c92f1d5ea0d1f68212f001da7 SHA512 c257bb40d7c4746e50f3733928c992017d57e3fac641bc63ea41754de50c5adb05ba1629e750b3943cc28e5d19ae709e5cdd3fbbe9ea35563bc68707e0e98e80 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20200817.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20200918.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20200817.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20200918.ebuild From 92a3de35e0aae745e53404ffb3be91592b2c36e2 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 20 Oct 2020 18:59:50 +0200 Subject: [PATCH 4/4] .github: Update KV_MAIN to 5.9 --- .../coreos-overlay/.github/workflows/kernel-releases-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-main.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-main.yml index 96e7f16337..ac07b400f7 100644 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-main.yml +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-main.yml @@ -13,7 +13,7 @@ jobs: - name: Fetch latest Kernel release id: fetch-latest-release env: - KV_MAIN: 5.8 + KV_MAIN: 5.9 run: | git clone --depth=1 --no-checkout https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux versionMain=$(git -C linux ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/v${KV_MAIN}.[0-9]*$/s/^refs\/tags\/v//p" | sort -ruV | head -1)