commit: b4603d41a52928d8bdf75002b9213485496a71c8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 17:22:38 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 19:06:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4603d41
sys-kernel/vanilla-kernel: Bump to 5.18.4
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 6 +
.../vanilla-kernel/vanilla-kernel-5.18.4.ebuild | 134 +++++++++++++++++++++
2 files changed, 140 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 9cd89ee5aac0..4b3f337bc95f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -3,21 +3,25 @@ DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B
a0246dac2f7a4ad6a55b611
DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B
94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1
SHA512
fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
DIST kernel-aarch64-fedora.config.5.17.11-gentoo 239036 BLAKE2B
7b4cfd0cb29d5a79f7af585ae019723da74de58eb0e756ebb783ca0e17a79b68ea751f9c7eb7f31f16adb334e2b746228b55bdebafe31195cde4a379aa865b48
SHA512
08de60599905b032d09ad263670f1501513366d89fc224e21c1689fef97f6ed28db9149becf7363f28f2983587cbefcb20ef99f6b5dab8ad24ad9320ee829790
DIST kernel-aarch64-fedora.config.5.17.3-gentoo 238977 BLAKE2B
5f3a43fff7ddfe4dda03f00e7f4af761ff978bbc9c6d2fa73b605f60755a0d40e494428725a7728f5e2f5f58c9931d8d60b048d318e22c635588e546209dcfb2
SHA512
4c22514ec7d2d4ce87087aeae17a5f68efc3e70f48298895262d5dbc47623de6ada4254ee3a7f06a302d37af73d921470903f2f3a86fe5224e638bda882be7e5
+DIST kernel-aarch64-fedora.config.5.18.4-gentoo 242525 BLAKE2B
d27e9b2f96f3d7968919eb2bd4f67b62543a9fbbeb2f1253a39046b4e3b9cfbff1266c21a98a2d86dbed1897bd41d8795726c6491d96bd1de25ad1a012fabaa5
SHA512
bf7758b7a24c4abd46e66f031e1da5081e324a383c710f60446f43296fa7543b3dad47c751ece8667ab0715e1605b104b6ceb36966a0f474ae4ec8641425914f
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.19 222233 BLAKE2B
9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617
SHA512
49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
DIST kernel-i686-fedora.config.5.17.11-gentoo 218149 BLAKE2B
a1a4946185e678b9c42f8e524de25efea1a049714e07f8f64bc9482680fe4668bed2b6a91a7e63d4142cda50f3d3a05c64b62e4477d2411e0251546b6774b12c
SHA512
9ad7a0a213637d9818b95ea86f5abb2c6d2fdd0929ddd15db32a0ab4c71c2ff808a066846bfd054a27dce4056942db98117414399484e1688c6dc7d7d8edd0b7
DIST kernel-i686-fedora.config.5.17.3-gentoo 218090 BLAKE2B
1d972e6ed16c7dc1dd9959ae406af52d1cdc15f85f8ab376e4d7abb79d9e284a9a68442bde975f5f1a9bc64fffdaee96d1f41392238538b37f1b6f9652ecfcd6
SHA512
2c32cca1f20cf54f3e9b394f6e3f14f435bdd72fa22868416129bfd4253a3cc8f3164b6868e31292c2404a1c433944783279e03b45cce9bec3b2813cb4675b27
+DIST kernel-i686-fedora.config.5.18.4-gentoo 220827 BLAKE2B
f73a4fb7d46e9275b5a0ab119aa8915cb7897a5652664efbd71596b5b3be6ee4cf9f9c7907ef3fe45ab2a2868512fad7b4b11213534d6260815ca4eca7593ae0
SHA512
afce5864ea980c1a7b53c187b483c6fa8eb88d11af9114d71b6177b4347d534d7f9dd68240c0cbb729e0da3cc01a5783b6e150d94708f1aabaa6c9956bacf06e
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.19 213339 BLAKE2B
db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d
SHA512
b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
DIST kernel-ppc64le-fedora.config.5.17.11-gentoo 209309 BLAKE2B
4b94a9ebac017c2cd4240eef9bea7b65c0e0fb75e1f02d2e6585c0f352f91e1113e0fd8f527cb3d3f96e93c50eeee74186ba6c2574dd45bee515e031ed2bad9d
SHA512
72c05e6e64ef8e2430ac2fe592dfcb0c5c8def60f2d53a9f2f7bc1e9f5a98faab2ace7ab73758c008bf004eb99bd91eb11be90198178b27636d7873e38ca6943
DIST kernel-ppc64le-fedora.config.5.17.3-gentoo 209239 BLAKE2B
7c6fd8bdbd8331def5bb658359aeb3d52a9f0e72d9312699e00d852b6740250edb1c7a77ea76521b0be6a8ce41888aea4ce8734bb267cc1f3e216f2cbd6ab8d6
SHA512
f25199dd6cef4be45049fa7d6cc1dc1b8a93ddfeb3b3824e6ead76443c1ea30e31dfcd4ba66625eec74ed43ab255d1e21cb2a9011160cdc64f30c4b1fdcdb9b3
+DIST kernel-ppc64le-fedora.config.5.18.4-gentoo 211942 BLAKE2B
f92e988198b08bd7a30976d92ba152ac2986324c223202dc73bb733c903015095498b529cb5dd3b3d86d678c7ca0adba7f4807e9046b8c8215b2e1ebd06e53d5
SHA512
4f1d85a3f858a6e240e0bc34b37a77f78cf128b19de78404de9f0463d0d3fa6e87b84e5710b7ce501b92e162d798b372fb6843e83b3821a77a73ead2385e9014
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.19 223286 BLAKE2B
239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf
SHA512
9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
DIST kernel-x86_64-fedora.config.5.17.11-gentoo 219087 BLAKE2B
cec0c1948960ec5363830ece7be7d3060c74eb689e801af229017a9d9804cf9ef546168669d65598d33fd5b2f4ac9aaceeeafd33f92ddeb8f185cb507f56b417
SHA512
c1602e8a8401311ca82972278476916f634dc8ae810a0902bfe0d415d2670b3bceba59f016ed90669eb73b1a9dfaab35cba4a1b4428e0fbaa6ccd2701871af39
DIST kernel-x86_64-fedora.config.5.17.3-gentoo 219028 BLAKE2B
a8a3e2f31315d6aaf19c6771db94a3549379fd48a33b29b00d0311a36325ba8e9f124b5962a447aa8bf63b01f714298f4fca7ff071db165f183ce9023e2b4cf2
SHA512
8c7937310b8e9cbaefe4d6910595df373edfea5a56e439671583c98a752eb5d9029bcb32178ea6b09e6847e55e71dd9ab94e0adb149626ce04c8a9e8f6d7a145
+DIST kernel-x86_64-fedora.config.5.18.4-gentoo 221797 BLAKE2B
1873ffeab78c7e9a8186d255dac5b7dc5fcdadfa97d6a265aaac1583006adc1c0a150eff6892f1a82e622f77122051d0eca5e2cc0d9b95f8d0e36212d6c47ed3
SHA512
7c2325a12de85bc1aa300b5f3846711a20d43817a60a68e7cae84ac6505b3deb158c9dd0871d86e148f46435f36549231566abe276ffc2ee8bb9dd2ac5c40960
DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B
0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200
SHA512
f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
DIST linux-5.10.117.tar.sign 993 BLAKE2B
a4365bbb057db936510aa6f1e50b136a4e35c601d6003c3f78f0dbc2e5c18daeecba040e621c0c14ca25319da406c94b8dc469cc7c8d5003bbe94e1a90749e0a
SHA512
dd63b7be79912d46945f5017bd00c45ef73ea36cd8549aa38bfdb7ac9bc71b1c9d1b3c83794c38239b2b4beb17e83ba3fc8f8fa3921721519ca0577af9d59765
DIST linux-5.10.117.tar.xz 120409348 BLAKE2B
8258d709d637891dcbb8523c6d9c8c007a44b7f7a109ffa9cd48f9fd9b4e7dfba170f9ed97828f4beabe6c6ed34ac69b287ee489321569adb282c7d0745d3750
SHA512
3f9488c55a6e9458cf53e06992ff56054cd4c933eb0e87a5122b6b7367d6ca7aa3587572e8f5362cd3264104f839102f87f40ac98476f666c44488b9422fc39f
@@ -55,6 +59,8 @@ DIST linux-5.17.15.tar.sign 991 BLAKE2B
e7dd4791920ef75fb124f5e5860f15106bdd8ae6
DIST linux-5.17.15.tar.xz 128442092 BLAKE2B
14e42132958581b1d4ec01c9095d61ca5539ed894bf6c6eccf4a984cee496affe3a0f12383abbb1df46f55c1fcb667154ebf1f4f460f96b9d5166991bcb68a63
SHA512
0239fc941bd3dee4969f87d5a3bd90b6a6b5ebaed950a17a33e64ac6a110d3b9f7e287a134098403718c764b8dc78b72ed7979f820a20eeb3136f22d743c3aa1
DIST linux-5.17.9.tar.sign 989 BLAKE2B
a078037dddf7634cf5e854b79a873cb743a3809a4be3d6fc4c8d9ea2340ed61d118dcb58edecadcdc653ded2e4c552d44b56d5d962d833b6b37234726ac35b5c
SHA512
07c2d483e0b02ed17b27d774513cca9be47b7d163964e7f2b14f0be273e8d67747a164274ee1fcdf67abf39f7141297322eb5f39cf9cf4df89bd03f48fc95143
DIST linux-5.17.9.tar.xz 128449736 BLAKE2B
83dc3cf66933f42a3cdce0015716017ed7fd7810a380a9374bac495b9f0a96b1b95b05bd012332c4156189f6a02d8a9b8b33c9391458adb9909a75bf661d8547
SHA512
8866b6f0ab8cbc122bbed0083ee9b351193780143259b818a15cdde1581222ee728a60344ea9267d7f3e6b1563b24a23100f46e6bd185fdc1e169b804e48cc2e
+DIST linux-5.18.4.tar.sign 989 BLAKE2B
2742a67e16a88e6b6c0068e35176de11caefdea09bf2ba837594cbc1eb1b52ac4000861533e301f2f4f3afad468a7157f90360e0b0a88e4dc9693bac54dcd0e4
SHA512
3dcb8b9c8075b15ebe46198ababdd9ca2e95402a41eaf3d871f06fac2c68b1f717f6e40eaa7a1b4ba1a46aa4805148b43460b6551054d5ac611e0914d4dd5baf
+DIST linux-5.18.4.tar.xz 129853184 BLAKE2B
64ac558505062485a2f9ae9d67983885707814eb93a6df2468365b1f07536e7b06bbe916078162c9a2f9754620c3efcfeec4f308ef2dc520a3f8f76d7d0b8f23
SHA512
a8067e47195ce5ae6c8818989302ba9c01768190f1908541b4fa9230e23eb33a76f99ad6dbc36484595522179b2b5116bffe9a31b8731bca5d07b02ac546ac42
DIST linux-5.4.195.tar.sign 991 BLAKE2B
c80a3a547d82b7d394155f396e3beb66df61272dd5f57be00fcf3b8b6bcc419914fde3488b950f29f6c235210e8f777e28199a4126530963749ed3107c49a249
SHA512
a770e02e59031a8bc74c832c1f9947d0f2edd397de23eef234f18b7070128c8adb1836ca4297dce1afa9f5ddbdb97fa4404e2c90faa81d5502d8856dca4112fb
DIST linux-5.4.195.tar.xz 112920616 BLAKE2B
9c3b21e2bf18800c4b55bb04810e29fadc6414fd100d4c2bdd3df1ba7db72124a0bab389b9d5038fd04440ac69a06383df5b4c42d6e2a6382c81af8aba366bca
SHA512
695e46ea1ac6c587f39f724460c480f4994267969cd620a776766ee7a5bb88b346154baa3ecc3444dfa1d0d39a5e8a0f1a5e36cdd76a2c71ea7a899b8a8a9d7b
DIST linux-5.4.196.tar.sign 991 BLAKE2B
8da70a3f1f7a4bd7e9a312146bf891c160625126c9672a7c3a213c8dcdcad2b8ce9250b8bdfad7ab412e6913f6a1d85832818a987a3de040a38e2eba70079c3f
SHA512
96f28a7a44022e9a116ce15a164039088bb64b416d89cfae52ff33e0b05cd9c9b7edde1bd66b9a3838dcf4e937a73a02cea8af1c157109fa426bc55a6b4ad1d5
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.4.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.4.ebuild
new file mode 100644
index 000000000000..2bc8aa91f184
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.4.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
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.4-gentoo
+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://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
+ )
+ arm64? (
+
https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
+ )
+ ppc64? (
+
https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+ )
+ x86? (
+
https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+ -> kernel-i686-fedora.config.${CONFIG_VER}
+ )
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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[@]}"
+}
