commit:     9698326185e49bc835451df24e0c8591abce9ab5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 17:30:55 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 18:49:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96983261

sys-kernel/vanilla-kernel: Bump to 5.16.16

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/vanilla-kernel/Manifest                 |   7 ++
 .../vanilla-kernel/vanilla-kernel-5.16.16.ebuild   | 134 +++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index ee70011c8c32..563f2182ebbe 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,19 +1,24 @@
 DIST gentoo-kernel-config-5.15.5.tar.gz 4128 BLAKE2B 
e30fff372b0112cc05723463cb4e93de79b5b643483796402eb88a7e704706a4033af2dbab9424cf14b1d894b57fc053b969f5fbfa15cf74e30e3d045703918f
 SHA512 
5e8c6945da5e9cfb8d20663910fc38ee36813067e1679e17bbf1dfc6fc0aa9125f1fc949d81937b297215925004e0ebfb3b55c7e707184b5ffcf23d28882113d
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B 
e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203
 SHA512 
225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
+DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 
44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588
 SHA512 
3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B 
a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d
 SHA512 
7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.14 242650 BLAKE2B 
b5587c0e365a00a5283ea3a5184b473783ad6296a6516372c6c79305d2837e782d18fae8ed8e852eb6d946d1dac6c6159231f2249f3360dd1651e4f1f06d5694
 SHA512 
2a8447d8128a881c08745f58704a9fe46fcfd2048c5d5775a518e16b6f5b5603e22bcd4f04c192d541fc83e6253be3b29a5f0f39ddec96c8668bc801d9356a9a
+DIST kernel-aarch64-fedora.config.5.16.16 236126 BLAKE2B 
8e1035d2e2a2147879ab129639c20ae2737f98923e331782bb44c0076b46ecefe6ed0f0849ca00bb2a1ecdea6b53e2c21ad1587ef6537c9024e9ed9450bd95e7
 SHA512 
0d36c47012df44eb8c83b3bb15326d79ffd23999372acf101abfcfd151c9323c34ba9144c2b75e43f273c60324ccdc3516c136bc78a24fb2723954e67b0ddc4b
 DIST kernel-aarch64-fedora.config.5.16.8 236075 BLAKE2B 
8be6fe053e71b463b75bb1e3200ad74c9920d8505da36e38eb33676c2b70dca8efdcd2a1940a356452d2eecdb927168f4ac83fb33910e38a734f84b26a3fe6e1
 SHA512 
57442f07bfab3e0d2914b47893c63af946bcdebadbad98480a27fc922d4f018d9e5cea8d142f45e93026bb55d79f3b11d61568f46ef8b702ec10b1b9dbe90f58
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 
578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09
 SHA512 
66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 
92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b
 SHA512 
69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.14 222268 BLAKE2B 
96e283052369a936fbe0f415d7176bb922bc0e22925fc25a56e6e0c36a723bf7e9ae29bbc661c0a8a6c44a218482896f25c529f9cf7a0d3bc31de8ea88f50a5a
 SHA512 
b5ec452458b04ab316622239ffd98782a10eab17a02697d15359efdc18dfaf8052a189c66729157d2e9eed20aee25a47fa9b81f1da78d42150f10b0746f57938
+DIST kernel-i686-fedora.config.5.16.16 215562 BLAKE2B 
0e568a566e86f1b98fc85a35412c528d728975f14059c2f233483145f968fc6a02e49f7e14bf393ba8ed21cb61dba9ad0bdf77172785dc5a34546cd5f066efa1
 SHA512 
2cebdecd591d829a0b8f3ef1d3d7720c25c7c06bd8f3b2778999afaccc80132d8d663931b5279ab52c0c5e3a17714e0b4f422d71bb5dcd7e79b1cfdce59aca70
 DIST kernel-i686-fedora.config.5.16.8 215573 BLAKE2B 
b13e235930122e51a29ab923e99ad9243fa13e825b46ba2e165d9d25d231e5901ada6aa1a48b9f5a73dcc03b61ec80a8b609627319884d8bd013b293201e3b8f
 SHA512 
aefe2ba76439070b17d06c09549f29ae6b3c7c0c0aa611c1333f1b58ed5c607244f614226297c886af02eadc72513c27f4d5630777b4dac4b69e4963771a2167
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 
185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0
 SHA512 
6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 
889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9
 SHA512 
3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.14 213374 BLAKE2B 
527fcc240988d111f41a366dcbeb1a04938e8cb1c83406557fd9fefc64677ee7d2539fa21fb78ea66859c428870fd54b1d3827deafec17569cdba9991913c960
 SHA512 
9db1d852c9385a5771cf9992b1b3ba34a44d95abdee929ae85b6e6ff8baf6b1c7a4a6c4b2446ae7ce7d1bb59b4b915d5793b505e21d643e24dcb408afd60457e
+DIST kernel-ppc64le-fedora.config.5.16.16 207150 BLAKE2B 
4c35d020bc11fb6f9967e007e7b9c20e95247ec487337f1a211f33ac0b32943e7788fb70852272b6459be1acbc4de0ceaddf23008afb46e2910bc79dd44a9d85
 SHA512 
827aa34644daa5e4526339a051721809bb6bdba22f148ac7d673ef28e954f04d9ed2276772a94b0c3139f9b89d12c324c0a274cad67c135ab7a7deb58b2911ca
 DIST kernel-ppc64le-fedora.config.5.16.8 207161 BLAKE2B 
9fc75e8ee2b85dfb64fec7bffd38eecf1d0640c971cd7806a1ae825eb74631863bac352549f669d7b177895dd1a1d87673ed51d26f81972fcd55e1985f316c53
 SHA512 
63570697def9f9b7cd8dab98ef9f1adddc42258fc3a045040f7ef495dba2a93ab5d287ff3d2be29e9e643c42f17640b19e1cabe9a94b63079745bf90d9cc073b
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B 
b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6
 SHA512 
82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 
0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c
 SHA512 
b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.14 223321 BLAKE2B 
7605b06ba48c40841927a4f384d6b078b9b333ea5fb4b2cfee68a7ac9510daecd6e9e3555badae23f93b072a8d08b9503ef110dfbe35ebb058cd9a0c57437310
 SHA512 
e5ef924333714165d0afe5c33720920bf277ca341e939a99bc058f9ea52377a583fdd7aeb45a4060c6426c240fbeb9a6b80fc3dad19c75b112b507bd65369c98
+DIST kernel-x86_64-fedora.config.5.16.16 216489 BLAKE2B 
acbcdc620673d003fccbb3837f6d97efb3c2661b40a2f71a559ac74dc1c4c5854210e54d9b5ded6aceda41fff9128851682b439ce9d6d2f217ce309e72d45ee8
 SHA512 
ad9e0b62278ad5a6bce5aa77163425cbc44b002ad86b6c5a636bb6545604cc8bce148149ee84b81e3097b1aa836b9e98194026ca720247179daffe084e2f7aaa
 DIST kernel-x86_64-fedora.config.5.16.8 216500 BLAKE2B 
da5d13e4d2bae7e06768f6d1a478f00e8d198339a3961b80fe3a459c74908f675d03b04c59a20f9b607048189de9dd82ba0efc5d474bc6cc54d2395dd5c19c68
 SHA512 
9e5ac243e1c9f55a3df09dd4f0a0e53b34a557a96989250a5f0649142639d22bc4d12b57d49cf62051f52a4eac040018a97a839164dd72eb16118a6dda3d5ba9
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 
0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200
 SHA512 
f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.102.tar.sign 993 BLAKE2B 
10a0889848b5198b4bdfe131b34423eb0e0ce91b6df649b57d088e1116008a2d940060bc3b4ce9e24c5e91e78b8077a00c50dada776e42039b428e90e08b11d5
 SHA512 
7f20c13b2abe6ecb15f4d3bdc36c8d61b2065c60d9ae3f9310e1f763e2f7e3594df788f549b21d6961193de53c4b4ac9b589e243459de7cf9f8a988f2d919bc9
@@ -40,6 +45,8 @@ DIST linux-5.16.14.tar.sign 991 BLAKE2B 
86c4ea68d91d9faf8efed5922a33d783e7c292b4
 DIST linux-5.16.14.tar.xz 127571576 BLAKE2B 
151fa2d87c04de862913c360fb8bdb4d2cf4cbc7ca9777b97ee3f03005e8d5ef72b307fa5787ae53157291773158bca6b499cb1e71f6dc5098f424e15ff6c948
 SHA512 
3daf1b5a01cbab632492e18a8e71aaf2085545f4944ce587bc7c27e86a0a739d0cbffe7890ce9c5bc863b3c5083281bca6ed4df8d3c69d60c6dcc210cd86993e
 DIST linux-5.16.15.tar.sign 991 BLAKE2B 
da6ec5424d30e6781ac1fe3699bab8002403366f3876fc23370bed39830d359761ae7cc0e4a9e101237aa1a8404052507166255149cb208dc38dd93a2c3614c8
 SHA512 
c97028b06976dc732ef57108a258059275e7c6cfa6e4c89e1d30ba53b0dcd450ee1849b95d7eccd9d9d6e16be77a38d9ea82ad7880f84658150e13101378043b
 DIST linux-5.16.15.tar.xz 127599700 BLAKE2B 
5b14c19cca863da26f226b30f7a04d5767c90a882f9ff06241659f54632410868863a00e6ba91d82272e315d20238d3edcb7d4b6475bcb0162dfc47b6890ecc5
 SHA512 
6f0245740ebebc6aa687c5fb1226aee492d543fd202f88963a488cfa609e30d3d1116c362638be83f201cf08380b9c696a1d2ccb1e0934f84dde14eeb9b4ca25
+DIST linux-5.16.16.tar.sign 991 BLAKE2B 
ae5b61e2d369bb51219186795328fe72663acc73a163dc794ed3936efb8bbe7c899d79bcf42f800a3a74860a565fad65fe0e1ec534c3e938ebe18bd41c6a57e2
 SHA512 
52410a7e4f295d2ed72cb531af1fa5244ac0dcb8429ead99d083e5505c3abd64485e2614a31866a75e0bafd8e35dca82e78bf5ca8b329546994dcabf544673fb
+DIST linux-5.16.16.tar.xz 127585324 BLAKE2B 
2dea3250907d3fb74a91f5f482417b41f634d8dcc847fde84595e3f7069323af5d396c4f737e48e7ba68c1bc7ce7049ceabca48fc429b8c672c55b185b818775
 SHA512 
a922b950fd3803b922be40c826554359f44f9eea8bc44be89c1db1e7173fb7726601373fdf37256eab85a644eccc774fdbcec407c7154c233117e0331f028ef8
 DIST linux-5.4.181.tar.sign 991 BLAKE2B 
4ec0715478495d20c64caa05552dab3b7625147f31b0c5457c9e30d97efa309b541adf4b638bdb65b98f5324eb0486607a995b8ecd4f6fb68ac2cb433c62a685
 SHA512 
7a79fc9e600a5bafa7212087e81e902c3be8cd9926082224fe770ffb7f861663120c5099201e512db8d485523a79d8273e3f52f31302820247d47141cec255da
 DIST linux-5.4.181.tar.xz 112896524 BLAKE2B 
b450b38597c4a94c18ce5a347cc184bac0e5846f30b797c5cf06bb5186411a870ff573f7aec97c5612de10d695d5bf5fb63953e091905cab9fcc3c162b5154e3
 SHA512 
10fba413fe8da1b569d1366bf99d18ad3b5765abedb81931f4d00b40daacb8797e122bb2fbc1a739f1d9999e01e0b920faa58be41e2010a625c1d58f1b54e288
 DIST linux-5.4.183.tar.sign 991 BLAKE2B 
a56523b58f38558061c255d50caa0add22328467829751151af6525ca624515e7cfddf50073b8ae9c5d58c6776ee51aa658fca28e3b9788c58795d762ccab77a
 SHA512 
9f47cfe7333857f9c8b37fbd67be682f86153a83e6d6b7923788c4ca2fd15f26d133359c9d1af99f8e12ed9914f5e483a8b5e698a83049fe572fa4a0d50e23b0

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.16.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.16.ebuild
new file mode 100644
index 000000000000..42cf43a0cc25
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.16.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.16.16
+CONFIG_HASH=95484c155424c62930acc1c61803f608af3f1cbc
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI+="
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+       
https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+               -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+       verify-sig? (
+               https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.sign
+       )
+       amd64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+                       -> kernel-i686-fedora.config.${CONFIG_VER}
+       )
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+       debug? ( dev-util/pahole )
+       verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+       if use verify-sig; then
+               einfo "Unpacking linux-${PV}.tar.xz ..."
+               verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+                       < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar 
-x))
+               assert "Unpack failed"
+               unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+       else
+               default
+       fi
+}
+
+src_prepare() {
+       default
+
+       local biendian=false
+
+       # prepare the default config
+       case ${ARCH} in
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm)
+                       return
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               hppa)
+                       return
+                       ;;
+               ppc)
+                       # assume powermac/powerbook defconfig
+                       # we still package.use.force savedconfig
+                       cp 
"${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+                       ;;
+               ppc64)
+                       cp 
"${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       local myversion="-dist"
+       use hardened && myversion+="-hardened"
+       echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || 
die
+       local 
dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+       local merge_configs=(
+               "${T}"/version.config
+               "${dist_conf_path}"/base.config
+       )
+       use debug || merge_configs+=(
+               "${dist_conf_path}"/no-debug.config
+       )
+       if use hardened; then
+               merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+               tc-is-gcc && merge_configs+=( 
"${dist_conf_path}"/hardened-gcc-plugins.config )
+
+               if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+                       merge_configs+=( 
"${dist_conf_path}/hardened-${ARCH}.config" )
+               fi
+       fi
+
+       # this covers ppc64 and aarch64_be only for now
+       if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+               merge_configs+=( "${dist_conf_path}/big-endian.config" )
+       fi
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to