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

["Michał Górny" <mgorny@gentoo.org>]

commit:     c57c84671e371183859a937f3ba93affc996372e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 16:31:52 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 16:38:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c57c8467

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 90cbaad678ee..c1efa2be1135 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.4-223.base.tar.xz 5119600 BLAKE2B d2ad667a58be0061e5e94a885f3c
 DIST genpatches-5.4-223.extras.tar.xz 1812 BLAKE2B e0ebc78506b6ca3d8bc09164b26f15a8cc94495797fc17a36381a3f031dd81bf7870915a48b0deb4f58cfb43e5ec4a64e18e6ca6c00837bdfc5e4fab913752b8 SHA512 ce01405cfc355d6230e687c407c9a5e92d88c6f0837eda19d2bc23d3517df4c5159332d491459867841827e0dc3976c8229cf0d0cb1c9d39360ba67ea616a734
 DIST genpatches-5.4-224.base.tar.xz 5119576 BLAKE2B 3f5fa9712da6376491d9903759334ca4981a6fc9b24919ba6acb5114ce805333a26052570df1a192dc8e062ee77667b45dac62c309d37b02190e4f8a07640aea SHA512 d433e356e47f0a6be0ba3b41172618f0b9cce634e4227924d62a8487cb74af3ea0c4d3245ee4fd2936d39ed5eb839d52985866b9d796f7e7a84415a6b60f9b50
 DIST genpatches-5.4-224.extras.tar.xz 1812 BLAKE2B d28183946e63eedcde3ccc19d84baad11b74349abbba19501c0763ae4597150f2ad7397c19396ce07627643cae526e6ef216dfa2166d217e8452719887e7f2bd SHA512 6505c71e0da13992e0abf5ffd31b414b4bcbde4be78abee6e9d402c14eb329e212e85cca77cb79591ba6d66b3f3b4ae2014e57cd8a88b39373a5dc2403f37d26
+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-6.0-4.base.tar.xz 272160 BLAKE2B 3758714884e31f3ddb414d2011752cdf7fd2da9d54b6dd455e9b9ec559c0201fd7753df98a1cba0618f209552419a56ef8747ac0283f794a41769dc41b3844ad SHA512 ef8292b96f10586cbc9a9ba820bed3b3f30ab1e4b90d3452d94b5e44dd4c333818c99bf6cee1272416e83cda424942be84a7aa6f270687192d94a583e8a836c0
 DIST genpatches-6.0-4.extras.tar.xz 3808 BLAKE2B 42c2695cc364ed353e1ccfa945c6f69c2b3c81e32149de5134eeaf2a738b67a952ae33ace111122bf2c58083c81a4e056e8f666693d02c39f6631a7502c36038 SHA512 305cf01975f19237de99a40dfb2a395f0084809f00040296e5ec36ed949b4301cf7887dcd3f6e287945f8d92f3544e84f3ace2ba60d6720ae09458475159132c
 DIST gentoo-kernel-5.10.148-1.amd64.gpkg.tar 66600960 BLAKE2B 8aa2a893602b1f1b9b94e462c8e6588d04515e78f7ab41ce124db79ca46e890674bf2faff1245170cf27df0a8130b3229c9fa6b70975555b22f98c275216753e SHA512 eaed6a7c5a3f993d8023a05ce701303d2a3af7e4acf038a96ef90ff2fd05c1f1ff3b7ce58fc075758625fe0e3bddef69bc119b32717ba30bb65c30e85f69639f
@@ -42,6 +44,10 @@ DIST gentoo-kernel-5.4.219-1.amd64.gpkg.tar 60631040 BLAKE2B b50c065ca4259719a0e
 DIST gentoo-kernel-5.4.219-1.arm64.gpkg.tar 56832000 BLAKE2B 75250e0407ea8b846658a59b0e53d9293112c7e109a004783ea9ac8e54534065a50ebfa22bd9f1f059f55129bb39ba8948cc53e5afab1527ca97ec23902738ee SHA512 2e55538b7f10def530abb3ced3dc042e0b6b4de173dea949610353e3e719136860bb7271e6164eb2dcf410486a2c249e4898f0bdf24bed3140d29963dba0e229
 DIST gentoo-kernel-5.4.219-1.ppc64le.gpkg.tar 54343680 BLAKE2B 28888b569baaca609212ac382b1a3ee11bf518587d00d3553118340e847c7a3e7f814bb4727a1931daa6c39afa8567579781fd05726b759f2df8d3a9b44f7ab1 SHA512 93a8bf9453f19222cf8c0e0ad399f3bab7aeaf0ebc1c8802fb53fa2277e150584203050aea9d0e549d1bbb96a88178b891552dfdba4c460b54e20f3629cf4435
 DIST gentoo-kernel-5.4.219-1.x86.gpkg.tar 52387840 BLAKE2B 9a91a823ff95ef19a88cba5d2c2992632edf2f8a8f88c42b43c0b7dc36bb67d4ac273b0661d96520caf92f69c871aab7a7d9db1dd2cceb2f628fe88557e600ad SHA512 aa1572341d40f80ed3136bb9efc1b0519cd67d71fee6a39307a1dbeda1c086b6eeed661ea5216a3f52125d3e4e89ecc421338d40d164520301747ae5b8f0e94b
+DIST gentoo-kernel-5.4.220-1.amd64.gpkg.tar 60641280 BLAKE2B 2f96ba924fd7d73748e77067125521491d826f1798700f0ffff09793f8bbdcad2cf745bb39038516b39355f7a44e10fc09b0bbed3b58c884e74ed6ff81ffa2e1 SHA512 364ffcfee11a9aaa54761895844fda044b2c8afbbd05461d9e3411e54b5c27dd8fd76444c613b030f7a69dd7e19772850926d282ce14f40c727ccaab006b704a
+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-6.0.3-1.amd64.gpkg.tar 75898880 BLAKE2B 22fa37348aca6e271a09253e60ddf1bcc05a0a669c5eb6468a76e60e0c8a74714960a49d9d3ea98cb9c5f5df2d59d7fd357d03c811d948887fb76f98cac21407 SHA512 2a72a5bb597d5ffb31604d9d8d3ad9c70d10a2c9fa7d19ab38d26160f786097da65f5dbdc9aaa4e2b3a704cd23519852536260d2fc2f6314545467254ae76fb3
 DIST gentoo-kernel-6.0.3-1.arm64.gpkg.tar 68792320 BLAKE2B 0b823e99597f1f89e6753a41b9940eb65afbfd0c43b86c46ead94b81e82f9d1e2653ff2885691fcaf6c0f5e1dc2ebd047fa4fcc0d07a1a559cd72bfdec33d136 SHA512 8b991af4189f77a5c2afcfb1c3323fef4d743eb8243d6fe08202892db4ae77a2eac7b54c49aae649ab385818a85907731f61290541788dd6020246773018d477
 DIST gentoo-kernel-6.0.3-1.ppc64le.gpkg.tar 62126080 BLAKE2B f0ba8e04802ed6a1bc66f9965c83d3beb21b5ca016f3a77c9b0f15550fca521de395d410341d6d698053ab81bb454854a906774d2f819b5a0c04e1097286d5e8 SHA512 dee4eeeba7ec50148377e6912ee57c91715afc0161c14964d5d304446470587316ec61be2c084a524af2165ab6c66fadc89467d83c0a2c5bb299c4b027a687c6

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.220.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.220.ebuild
new file mode 100644
index 000000000000..7c3bf64cd0e3
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.220.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
+}