Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/
Date: Sat, 18 Sep 2021 21:03:40
Message-Id: 1631998615.04c9c35214257a7fea1d30de2bc31fe82cfe7435.mgorny@gentoo
1 commit: 04c9c35214257a7fea1d30de2bc31fe82cfe7435
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 18 19:47:10 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 18 20:56:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04c9c352
7
8 sys-kernel/vanilla-kernel: Bump to 5.14.6
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/vanilla-kernel/Manifest | 6 ++
13 .../vanilla-kernel/vanilla-kernel-5.14.6.ebuild | 102 +++++++++++++++++++++
14 2 files changed, 108 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index 333956c60f6..2fc1221c60e 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -4,18 +4,22 @@ DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e
21 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
22 DIST kernel-aarch64-fedora.config.5.12.5 229203 BLAKE2B 056ab111c4bf623f4476ebb38d409048198442040611af2d84801106875e5ec05506ac0c4e1c1124bf9f3700e59cbf94e6d467be22c2c9e1a95619461a1867b0 SHA512 a2495ab8ec406a3b29a099b0e2285420940b1dfffeefcaf8bb69e4ed54fb2714b537e40eb2818468be2d1d2e8217cf8d7b9f123b791676866a2a79a98407e4c3
23 DIST kernel-aarch64-fedora.config.5.13.9 232105 BLAKE2B a9583f9f74b3c086d04bc028f09d47f6ceb9e32d56caf9ed2ac12b362f46e14d9c5c05782e547ae463cf91d3663077d0d1077892b073ead70728cc47e18fe3ea SHA512 cf92721c71331da2c4be3a765f8196c0a6bda174bc518692c364a2847c5522cc84ee753a6a0971ad82747f093dc465ef36d8aceb498a901404aec1aba746d52c
24 +DIST kernel-aarch64-fedora.config.5.14.6 239152 BLAKE2B 0cbdfeef291cf34a761074e6b83adddf4c0c268878a7b11ac384b9c43cf5ffb26d4e5eb80996c43d63d4a143d9d03e4c4351d087819bae69199a1f593bfd1c6d SHA512 3c9348a35aa8b2279414e03e4b13db849ca1dde0d0a8ee76daae01df93a869749dd90d4d64eefcc5bf345f1c4baf212dc0fce6f54666d3faa126cb65c6dde813
25 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
26 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
27 DIST kernel-i686-fedora.config.5.12.5 210160 BLAKE2B d06f57b85b9f7d65da47817e5143af804cdbf34625f74d27b7598f3fd0fdec090f7b46479c991d2ec00a35bd5780120ad7b698b89269266e905a135098b40f24 SHA512 21b0fe9c600c5f5302edcc850717872dc8707d1791f87029075be4ab30f2f2fe28b1b042dd9d5b5dfcedc020e4f192a3083c1780dfb3d275aa47fc0f9b1a7908
28 DIST kernel-i686-fedora.config.5.13.9 212571 BLAKE2B 27a5b22855d55a06ee52000736fa7b883ce596dd7c4e602cd9af2c8aeb3dd17c21e7a6b6ca083da58400ce8f9879093ed17a11d551bc3c1300a9d6dc5771b319 SHA512 65764268e52be561df5d744dc6cda1b59d9eb98562b97692ec055c0e1dee621bf82a68df23b1b3d3a23bb537ac731f9c913c1f4fd757815bf665ec81520cd6cf
29 +DIST kernel-i686-fedora.config.5.14.6 219466 BLAKE2B 1c5a12ac56acbc02f289b0f3a76af845e85d9511bb4ae1e8420dbde3afb9a4e963229ea7e223e5abd5d38bf5bc7fb3130fd231c47acb0f23bef2c4f5e12ba686 SHA512 2a4cf8ad0a6b4aaa2468f98aaedc8d789c19c73f3274786aaa70576999594d5d6974efb18a50d2b01b3d88601d0251ca8cbc67bc9710f4d1c9f7073d5638392d
30 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
31 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
32 DIST kernel-ppc64le-fedora.config.5.12.5 197238 BLAKE2B e273514c3b4eb29309bf35351127cdc00903e4642f0a4f75633f80041d8c953046f734eaa0f6e8c7e2aecfbbafee86bf945f5a18399a668253fba225c2edb999 SHA512 bb6f71858a41b833491e2cea22a3d724512b41d04bd6b17d16087f4b7747b340354c41e32d7bf234d8dd1a64adc500206d67a030948100483791dc1ec0732a41
33 DIST kernel-ppc64le-fedora.config.5.13.9 199766 BLAKE2B a382e59e1b75b0cf6154074fd3a449d07c96a32f098405a47bbb34cbdbe145143827ac632ec075b929a77da41d65c6a42867222f5478f9319b3e80d66a3fa2bc SHA512 6cdc5c5bf12ee3614128fc98dc6aefb192ea4bb47b5b687e17257453fbb92b5b9d5259c3b1c5bd706329cfcfc83e2cf0ac69d929d9a2a6e95073cf448bf42572
34 +DIST kernel-ppc64le-fedora.config.5.14.6 210256 BLAKE2B 02d11487c386c26147258dca832f801061a0249161859a1ae7217eb1adb2e22429bb4a629c7e75d9bb78de229db8f3d9ec666c492317fc49fa0ab3e91be5d4dd SHA512 2347e846754ffd1de829ff0740e67bd249baa3d52b6dc73a98718ed1e68ae56912c4f9323414ae900ab9b7dcde24e252fb36c5edc6be5f52259e8e260a55f54b
35 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
36 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
37 DIST kernel-x86_64-fedora.config.5.12.5 211204 BLAKE2B 6276cd8eca1d82933cbd3e95608e334730b739936c27a922ac0a7319f64acbe46294c5920b67213b694ff9ccda5b0ca99e6e2519b496e608ddaa35b27e26ed3f SHA512 c6955e7cc1ad874a3af42136b7ed958f04905de8f337d83fc36d59fdde5a469f260f8f29e9f6ac516b3c138679de0e37949b144773e24a4892ebcc8f729845de
38 DIST kernel-x86_64-fedora.config.5.13.9 213604 BLAKE2B 9f594a498744e03f8f87bb434d362aeff326b34b1bd4d0a6b0027ec3bd3d15bee554be4883a75d3c19ba2174481f3dfd23bb9d9d713485f6f8474f608515d5e2 SHA512 c11abe0a6a81221bfbd2af0ede4358b464a5bcc72eb46e153ef513b4f7e85e2beb9159234b264e5fccccb8767a89efccc6eb1abcaffcb10f6d3fa5cef6415405
39 +DIST kernel-x86_64-fedora.config.5.14.6 220488 BLAKE2B 15e295e91452c12b7feebc2047e0f116c3f464be81f9f3d866bbcd42c38e522748f70f74e6eac12a9b34b97957f93174ca90187d8c0befcfb1a3e4c63f240c57 SHA512 0a2375c440f3308f46ee4cfc04b328387576193cb5320e608f1f98c038e802fb01cb48a382d05c8cccc91b13f49d55e66bcfe4e625e2ab1d6edc89a9ee61291f
40 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
41 DIST linux-5.10.60.tar.sign 991 BLAKE2B 9c29c9d981e5f8ca8381a3953ed430117380a15505182d7854d681783b29d8ec444e8ce29233b63283c462bf95419e71db9932cd2dc4261321de5d1caf6abbb2 SHA512 8b60c36b97cd427f20e8e82cc63de7346c88a3081e38f4a6e499c53b72d9f2297f1cbbc08e6da112a3f37afaefcaeed22c70e51d7c91ff271a0799e0ecc31b86
42 DIST linux-5.10.60.tar.xz 116406216 BLAKE2B 4b7d3cee0055c03ebbd7c79b1d6a6098f25c2205ab8daa1dd8ac416ff8c16f6026099cb906b61bd93ca5ef2b9fcd958a54c76265f61c439cbe5b75c6e3953345 SHA512 d0cc61498eb762e4f1d7408f721b946e0dccf4748905ba7ec320ad6b91a9042fd2e08a4742a3b3766bc1730152eb7e02a71ce64f935ec32384bd0cc1dade6f93
43 @@ -49,6 +53,8 @@ DIST linux-5.13.18.tar.sign 991 BLAKE2B c5c2a28fa6d2fce7e2de300ea21e20e371002e6c
44 DIST linux-5.13.18.tar.xz 119350900 BLAKE2B bd230284e71999c676faf1ee06cda910d5bfa427cf3dbc1d1e08eab21e460e6da1552a7ce7865da0deb0ef7a103c6143f0201176f3cc2d5381132d907819e3c6 SHA512 ed145f47ce64b6434c32b910f8fb3e02a13922c8c2bd83ff6b4d51a3bc8d4a6fb7d032ff5c1f7e542aaf2f4cb12084cc2b9e480c881911430d914488109c315f
45 DIST linux-5.13.19.tar.sign 991 BLAKE2B d26b1e733f84725318d8dbf1e9fcade7beeadc38a4a07aebf6be653ab0dff5c0a5533b5591e753745aeeeaa7650b2bf0d1942878b2243aac01b68d0ca81f8367 SHA512 a4c5ad726818ad7bcb87c3b6621abecdb17ea14ba6cc8686bf36ace3c0d16f8c5353b4f02f0b02b60967957d13172c3fa60b1415ce3d2dd1c0f8a852127a6c4e
46 DIST linux-5.13.19.tar.xz 119374060 BLAKE2B 6a05829867d75705e0282418bd68c1b60a4f2cdced39803458d67c975f8aa3ed455300c19300d7c7cfad71d2e5750b0b0750f825aacb0fb3794eb5b7b3189cc6 SHA512 77f6279fe7de3c0dd35946b991fa190aa70f5e806fa6188a0a676dad0939e2a20136b3dfc659dcac7870b387ead328fcdc287c8a25b63120bea1ac960117990e
47 +DIST linux-5.14.6.tar.sign 989 BLAKE2B a871082119f474dc0e451f7bdce41e9ce6143063deb42f47568e3158b3b4c243e67303e5fce34a55d9474acbb43f7a0a88e17a361038ebc0f4997587b4e9b0fb SHA512 ae930b77781474e177a86135cf0fa9645543b4f97f5d0ae0d5d5113efa854c578b358d7fd087dd71405d77345c60836292720ca0f7e346f9c3ea112f8f316289
48 +DIST linux-5.14.6.tar.xz 120689192 BLAKE2B a60c98265c4e795cb8fad90c57b9237b586423c6c8d6961c2f64db13bc6203925e3e6d79ff8858f32363a45f7f1a463de1014fddf9f4a14216a3d3ba638327d6 SHA512 117b466e7edd9e2cac79ae9559ba1e24d7cdf1cc6b277292f08b58baedef7a8d6e17a5a16fb47f662d9b2ac6fc36b2c561dbe4b95d848e645a6c6b27c8504c51
49 DIST linux-5.4.142.tar.sign 991 BLAKE2B 2d441365323df4e0ed023917a5d9eeff671e29d1afef32813d6ff4cf554a191237e27acc1c1192817007a262bc8e5d8f42d7aa14ff0add7cdbd656fb20cecdcb SHA512 728a40e0cee11d6300ee3b1f13b329496de0d5e31872dc8335169396b077678c8bde4361c5fbdad3e54f8761dca507cea71bf8cbf5ea675c9c8d7b055c073e2c
50 DIST linux-5.4.142.tar.xz 109145144 BLAKE2B 680d4a81fb20005d39dd6d1b512b0e744cc7d6fcdb45e6d67c166d7ca7dff83acd49cb14fa4a38369d77bc91cac0b36190a5b1f042495c40fee9b5e7ecfb2dd2 SHA512 fb9b9f345bb1d46e48adbaac7b12ace50f279451793ac3671b007447d3e38a59d9b9ecbc55866fa2a6850babfcd1ef7528234f2ad73e68845a858b3b7a1d573c
51 DIST linux-5.4.143.tar.sign 991 BLAKE2B 4d2d5f6cd7c78234e074d59a004b1a96f86746a9b692d7acfa8afe6ce5bd40a02c86c7e53d2749c71956b7a5862bb0d4f46b79b1a6211e93028b53728db4b477 SHA512 f8fde6c2b06c3a7ab9b375f90177e1809460514a95bb78c1533bc55df00b80e09c87145b67d5ea336dc3d25fb9406d7b6818695de1ce0ed1ead60fd3df3173a5
52
53 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.6.ebuild
54 new file mode 100644
55 index 00000000000..d3a06ae0974
56 --- /dev/null
57 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.6.ebuild
58 @@ -0,0 +1,102 @@
59 +# Copyright 2020-2021 Gentoo Authors
60 +# Distributed under the terms of the GNU General Public License v2
61 +
62 +EAPI=7
63 +
64 +inherit kernel-build verify-sig
65 +
66 +MY_P=linux-${PV}
67 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
68 +CONFIG_VER=5.14.6
69 +CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
70 +GENTOO_CONFIG_VER=5.13.4
71 +
72 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
73 +HOMEPAGE="https://www.kernel.org/"
74 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
75 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
76 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
77 + verify-sig? (
78 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
79 + )
80 + amd64? (
81 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
82 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
83 + )
84 + arm64? (
85 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
86 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
87 + )
88 + ppc64? (
89 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
90 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
91 + )
92 + x86? (
93 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
94 + -> kernel-i686-fedora.config.${CONFIG_VER}
95 + )"
96 +S=${WORKDIR}/${MY_P}
97 +
98 +LICENSE="GPL-2"
99 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
100 +IUSE="debug"
101 +REQUIRED_USE="
102 + arm? ( savedconfig )"
103 +
104 +RDEPEND="
105 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
106 +BDEPEND="
107 + debug? ( dev-util/pahole )
108 + verify-sig? ( app-crypt/openpgp-keys-kernel )"
109 +PDEPEND="
110 + >=virtual/dist-kernel-${PV}"
111 +
112 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
113 +
114 +src_unpack() {
115 + if use verify-sig; then
116 + einfo "Unpacking linux-${PV}.tar.xz ..."
117 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
118 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
119 + assert "Unpack failed"
120 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
121 + else
122 + default
123 + fi
124 +}
125 +
126 +src_prepare() {
127 + default
128 +
129 + # prepare the default config
130 + case ${ARCH} in
131 + amd64)
132 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
133 + ;;
134 + arm)
135 + return
136 + ;;
137 + arm64)
138 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
139 + ;;
140 + ppc64)
141 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
142 + ;;
143 + x86)
144 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
145 + ;;
146 + *)
147 + die "Unsupported arch ${ARCH}"
148 + ;;
149 + esac
150 +
151 + echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
152 + local merge_configs=(
153 + "${T}"/version.config
154 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
155 + )
156 + use debug || merge_configs+=(
157 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
158 + )
159 + kernel-build_merge_configs "${merge_configs[@]}"
160 +}