[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/

[Michał Górny]

commit:     8ada27be171b7831df8ba84c2bbfe72348666e97
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 15:29:06 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 15:31:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ada27be

sys-kernel/gentoo-kernel-bin: Bump to 5.4.221

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.4.221.ebuild               | 127 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index b680026bfca0..cc91f706153e 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.19-19.base.tar.xz 1098964 BLAKE2B c79251602e677d36db4f923ad148
 DIST genpatches-5.19-19.extras.tar.xz 3804 BLAKE2B c73e8bb8be2845ada725f71045e69fa38c99d0561e702d38e3827cf1e25ff2ab2105e3142d0f85baea59fa4a28a4521202d222c53190b741055609551ac1039f SHA512 b6f813b816f475a120543f637857f683e82cb22484fad7149bfbc5bcdd6d5119373d915ac53d6b743197910e78fc2ebdf35bcfb3612015e571629d33740f2701
 DIST genpatches-5.4-225.base.tar.xz 5166864 BLAKE2B 20ffa864c45b41e82079158fc4645e5c809bda93c0de480aea22b2f1feac231c7eddaf031daae9939126297a197bb3cbcd48a696da76eda0fe8591cac817103b SHA512 da6a1febb01a772d8ba454de51fe902830461bcbd87e76f8f459bf9adbb8bbe2493914c5ebd4f291ea59bcfedea34d3aa96baf98409e84220240d70c17ab66a1
 DIST genpatches-5.4-225.extras.tar.xz 1812 BLAKE2B 9f10288c90b85f42bb95694c9fc215f680251d121cc371495b798081beb4cb6a6bea10a54e291a187cf4f194a9edf7ee479b461dc188b1187692784651f1042f SHA512 0b9215d36bd6e04e0a7aae544997d10db03770a9e43b152c266b8ed099a12fd8b6da851d81a0b3885e5e4965bf5d9fa5cfa3a6fa3f1ea9642e6ca7b9abef124e
+DIST genpatches-5.4-226.base.tar.xz 5186832 BLAKE2B fb55ce4cae1d02a54869a3dd5e319d8e09d2b407adaf26f7b5bb0370f4f58e620af8e9d7eb7ec12cb4e5906a29de533eda7234687d689ddc29dcded1c146be3d SHA512 e6aa0090c92cc6b3460c251544bdbf7d6c8c249e897fd04b5de0c34255ebfa8a0d29fbd7ff698656aaaec71978634b9685bf5b9052bef564587512a1def6e639
+DIST genpatches-5.4-226.extras.tar.xz 1812 BLAKE2B a477853adc62b2f1ee5d2093966c211638d4f0d3550de98990261db927a1946ee6a8163502f0a5b66b57d326521cdfe18ed1875bc126a63ce662e4442abaa9d1 SHA512 821a81cc51ecf898420e480860de4a7083fa2c6f1681e468f9058c7de403af07f72351395791facc34977dc05b6dedf4b2684fd29914bfe6802fd2fcac3465df
 DIST genpatches-6.0-5.base.tar.xz 279980 BLAKE2B 72e3445a0d791825d6aebfed695bde22454c1d3891176756d90b2cd6aaefa8051bc22a8c7b39326f2889e947d2f65112d386f8d158d1a5327aca142a9d2312fa SHA512 e74152dde7f6c6e511c500ab1038f5a5bd2473354fac8ade6293c43c288ead3e2549fe8f0a02ff205fd72f5947401372cee34425dc2cf23ed3bf1198ad7b6123
 DIST genpatches-6.0-5.extras.tar.xz 3804 BLAKE2B 36e9a4a81f9cc9bea2dab9138bbfa9e380ef6e6d1305ff27072f96be23a8be691c20505c07d0034f0cead7b0f955e463485fc7d488b04ccb951a27eb3aabfb39 SHA512 b0c4a0640f20bbad1c5a5ce4a4c7413c1bd3fa1463be6d8dde3447d0131beb0a5809be53d2df7660516affe4b35f9b88a6ad8ff1b8575cf76f01bc086e4ccf60
 DIST gentoo-kernel-5.10.150-1.amd64.gpkg.tar 66488320 BLAKE2B 548b1836f84cb713bfbc3a164e218f5d4cccc19287b3a7627de422fb521190401d890cac611a018f30fd6e6edff2da939cdb15e819470f76bf29b974b7b37f18 SHA512 c578eac829553e923fd0eb2fefe6cd182769e3ec74ff59d3a7c1d2b9cdd0838d32a16cc8f6be0599313d54da1a94d009e5ca9a8726c7f494a5d9820078430aea
@@ -24,6 +26,10 @@ DIST gentoo-kernel-5.4.220-1.amd64.gpkg.tar 60641280 BLAKE2B 2f96ba924fd7d73748e
 DIST gentoo-kernel-5.4.220-1.arm64.gpkg.tar 56832000 BLAKE2B f54dcba86bc7f872994d159b7f0da10ea77498467e47e89ec4509ebc1dd1695a9aaea70ee12d16565fb9219c93b62535448902c0ca74134f6171fa9577565423 SHA512 41c39a38947113bfd223acb29a4bcebab17b5a6527e031a1b816c200754a7c1026c2fc729d4713bf7a115dca142c340a54c6c9043b89252980117618689c88fd
 DIST gentoo-kernel-5.4.220-1.ppc64le.gpkg.tar 54333440 BLAKE2B 7ce90089ef680746fc5463e95d21749b3375be09f69ada78bdce546a6c045f47769903b4354beead709e060783871d8c01ff37fb292af5924abcef758517e265 SHA512 3a9e23c8ab3a47a2a0802bd31bd98524317c217342d852bd832ac56faf348d141ec754d74e94126f625a1fa51bb866d6dbdc55a9dd80c8790820d779eedeb9dc
 DIST gentoo-kernel-5.4.220-1.x86.gpkg.tar 52398080 BLAKE2B edc5156be6509ae6b7e9b80d79bbc749bee96aa5a8a85fbaec3a0e44b8ce7ccf6fba240bb24b915ece90e072a0668ba6aeae1d8475cb7ebe3957da7e9e28822c SHA512 98c26b588ebed7ada2408436bedaf85426f4abf68bf538c15f11eabdb6ffc2c4aaafcd7af529d7661a7332593da2e2883c463a86ad15438a7d136782579e6f98
+DIST gentoo-kernel-5.4.221-1.amd64.gpkg.tar 60620800 BLAKE2B 993d67fce7dfdf7e2acff93821da8401719882c14d36eb2aabf6bb3c60e7eb473373dc272db04c3e5bd4a8862c1c34b0d6a8a27b864f4aa4fe660140178efc5e SHA512 06735d798efb70dada9fdf0dd177b60566b62b3e58327662b6887b9aa7a360c792159867a80f92ef3220818058e53cedc94365f1293b3e04f2b0bc917922ff29
+DIST gentoo-kernel-5.4.221-1.arm64.gpkg.tar 56832000 BLAKE2B 7c29ab0e127a3054d3ac01369adffc2ef722fb64ca36a41adb8c6ef69f31448729cd55136ecfe2f16f7874fa2af3624c9fe8f16a8f687613de3532c339d6506f SHA512 0f63d784cd901d52656ef1af6e8bf94a099bd6d0d60dea20ad82ca071c3faabd96e71fc840898c8f1a40c0895a7548f427e3ea0892bb8dc06080de15605c18ca
+DIST gentoo-kernel-5.4.221-1.ppc64le.gpkg.tar 54343680 BLAKE2B 0787ddf2ccf561745e9717d203e241ad55a818982cd13ba5d8e3ae6f875263be3835aa98aedb2367fa0ff50b3e9b5c1357745f425ea2df34235fa12bc34e2aeb SHA512 d7665d570d36e7ed4fa8c8b1e5a5b5415d8a51668967f3748b1e97e48e50d974e8637a848c471dad40036053a210f2e4b484ef223a26794d00bf7ec140c89a51
+DIST gentoo-kernel-5.4.221-1.x86.gpkg.tar 52398080 BLAKE2B 030bded0c258a402be3ef507b62981a4c2b6c59eab83748285ee9769e4c37e3f481a68f21fd94da15d9b49b05e32fd8c2461aa8f36651b30dd7e5035cc380a69 SHA512 fa914697af7ef96f87facfdd82329cbd6818230cfab4779e5e49db2f246aac904269af357ebc66428870555e689a70b0feb40a474db84e041047e668b929592b
 DIST gentoo-kernel-6.0.5-1.amd64.gpkg.tar 75898880 BLAKE2B 5f4ebb5f829f76206838eaa9b89c9bab77a08e6587851b2f0c680b56c5ce74eb7a9a33e7d3e23f109f1ab9b61fdc15766260770e79765ea64ac7b07baab06b84 SHA512 72b33658a30b12947f45450c7c9f6cc8aebafecbe7940fcac476e780c46595d9bcf751849139ab81ddaef6eb1587b965bb3d05d7b8d693222cc98f44b71d1d0b
 DIST gentoo-kernel-6.0.5-1.arm64.gpkg.tar 68802560 BLAKE2B 33ed94c2431e6e17944bdf0bb8a50f420914ec040506cbb3ff8ec8ca752bc7b43be165881b85e4590e9d79665a5215639f84b6ebfc8ac4bd405ff26844668d51 SHA512 f34ea6de684e2bc1ac120117938e383446fc2f19744de95382a24a7fb6044a89711b86fc13479b5e5536c71fde4dc0ec1d9de6939a26e16e254d3ed1f405da8c
 DIST gentoo-kernel-6.0.5-1.ppc64le.gpkg.tar 62136320 BLAKE2B ae2c5b8830f123c5c2a853e5826e701bb46370919a24fef527f40d530e7fac9be23050cd36ea149644c9331954aaea20f23c44f8341d05b9b170adcbddb1bf2d SHA512 70635eab0375b229ae24efe2f2aa123249e8a38bd8fc864cad8afee0643c98f9f7ae7d4b10ea341a8ed14af4616bacfa2e9cf2e12d1aa47dbaaa21b4df619fcf

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.221.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.221.ebuild
new file mode 100644
index 000000000000..7c3bf64cd0e3
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.221.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}