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

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

commit:     0b0172ad9a77bf99a53c4aec2730b4995989e91a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 15:13:42 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 15:16:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b0172ad

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index b4eec3996932..69099f5c9c5b 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-6.1-81.base.tar.xz 4334960 BLAKE2B 9ea7c823ceeb092badfbf1c47bb59
 DIST genpatches-6.1-81.extras.tar.xz 3812 BLAKE2B 6521612c65bccd8ad9950aa2d613ace86229593be584c69655df14f2c450dac73abcadfc5b0df878f01ca9c689d1ce657300a2e81595f134ae236bc254fd2150 SHA512 65fabe58523be0de77ee5ace810ab3583e2e1c8ed957bbcffe46ae89f9b09c2dd85b9585e53b9a3befb92d9765fcf42636ee8b53dfbec5428436277a23a8d757
 DIST genpatches-6.1-82.base.tar.xz 4335544 BLAKE2B ce5397b5d00d226ecb13f97defab280bfec46a7e4a626f9579e9c348cba80d50c3c73505215418e20bc508c43453b6112159e2e7696a4abc7ebd9ff403f4eef8 SHA512 90c0fb104cb67666b38d8e51ca87658e771fdd4406537b919f4b47d5e486407f9729bb2df1137cc4fd5abb530fa71723a5157376c11cf75625b4cb190ccc59d2
 DIST genpatches-6.1-82.extras.tar.xz 3816 BLAKE2B 3371d009143a2bea266308d2369cb114434c0bc96453e0d87cd39d9cbb8b2984f9166e78ca06471af873ea8a286d5f9065107102625d283fc85bb1c21d92ffd3 SHA512 da9a7b58e8907b3379ebc6c40b084c852c5b1090989f5eec8b1087e5706a9c9b1fd87772f1f0efbe18128e85f4d0b76ee4e10b6c6bd409eff6930bf19971b7dd
+DIST genpatches-6.1-83.base.tar.xz 4358680 BLAKE2B 0ef9de04e2bdbfd4cdf2942ad1e1b27b8a314b07409cd7c140d0cc2783679a135eedd7d08860ed9fb6256115dbfbcbab5cd3d15522733bd72ec3d4d918fdc96e SHA512 544630385153defad073422da90ec6710d0b4e3444ca1843017b1f1b855add852045c0a1d7e8cd68c037746c4c23e8ec24df747469e177519384ca2e8185cfda
+DIST genpatches-6.1-83.extras.tar.xz 3816 BLAKE2B d22ef26f4b321319ce84b7bac4b345759519ce1bf4b821fd85590021f93c80242506b4ebd3cfca6ad4c1e56dc8d3600e54a0b459f07eabe0e154b03a0a1bb37d SHA512 086b04be251177d98038fc2aab2b4110aea45144996b3e50d7803e331a5660cef9e4c7d6fe794905dc8a22065ab8ecf4b5eb5f94e8db59df88a2c861c09c2505
 DIST genpatches-6.6-11.base.tar.xz 649760 BLAKE2B d435eda1a18196b24c451ae605c719cf5a45c255b2017f1b7ab3612df3f4101c003e615589841d02329e44c3411b4cb27b577e8ff05f09e9349d38e622b823d1 SHA512 b06c66f730e4a43d8730c5c98661b6061485696375d2bc623b818303b0f6f15d9ad9da318bf9d3153036c3d8a2215fe12c5fd8b789775027c5c21f2ef8d93c4a
 DIST genpatches-6.6-11.extras.tar.xz 3704 BLAKE2B a5ec7394f611c491ae0867c4694fdd000a0a53d6353832ecfb702f6b86711d7c955f0e4a8d10ee2cde6f2255a6e180fa26e3b1088f04902affa51d29f590fe82 SHA512 2ea475f922c98a83950441e86bd6805fc958f44c77866431b28da13d522d11841fc778945b253e292c8cd09ee378bd7e0169540ef12a9206d6341ec69ff463c6
 DIST genpatches-6.6-13.base.tar.xz 669256 BLAKE2B 9474c68e1558162a583278e9ee510ff2fe8412a1b2b2a9c3745df47c97a4d6e5f29a8e890a5205f43f2a2985eabebe2a5fdb7567f399f0301e58d1751eeeb5a3 SHA512 fc96cd9ed40c05f2e8ccb821206a26612970c92afa0bd893870cb0a54e5d588d11c6368dc166a2e835324ba066e4f64a03be4773dda0270015f3031d7fae05db
@@ -78,6 +80,10 @@ DIST gentoo-kernel-6.1.73-1.amd64.gpkg.tar 72581120 BLAKE2B 4fecc0db894c6899e0b9
 DIST gentoo-kernel-6.1.73-1.arm64.gpkg.tar 65617920 BLAKE2B 87e4c99c3c07fed92246ac265a8714d7b350167f4e2e81fdbe96e487a01ab661ca362ac124e38fe2f8b649cebda48b0553ec0bbbfb77af62a8d85ee0ee127032 SHA512 39770fc22ffd3e75218da0849f431fa236ca9b9054129aa40409634bea0f1c5b48b018f4f30d0216db0bba850e567002c652cf9c631d0f9388fe767cb3f0d4b2
 DIST gentoo-kernel-6.1.73-1.ppc64le.gpkg.tar 59883520 BLAKE2B a09752f908436e57d8ed3437da9d70dda1730e19a1ad7f62a9c94cc80239ad62e7ef10095f9b4ba083be935819ab652f36fd80f7d4dc08724520dc8803d0e847 SHA512 23590c60a7f585e9e775720f5ab267280b030e1c9eb0c2afe3dcafd93ed7a9df80070a209c5bbe89ac35452feef0d612a57ee35cc34e9c16921aa1d2502df37f
 DIST gentoo-kernel-6.1.73-1.x86.gpkg.tar 62156800 BLAKE2B bbbc71c31a180867bc85111c7c5e05c4f1bdff0e497cd897077fdd87a253c7fba1826263107a8a55e11039d3707c71433f8f3a77fd3c8aeeb220435887bb3df4 SHA512 1386e9a832b8787dae0beeb61da745512a09be9f5c15daada30f429351af3549689d458255c0dc9196c5a6513e5191c4c591861fe0b2a7d9bfcd8aa9c72ad891
+DIST gentoo-kernel-6.1.74-1.amd64.gpkg.tar 72601600 BLAKE2B 43b11ada3bed4fccd7ac6ce3cbea4ce142d43148d3645acea85e2eae388bfe389772196e0525b4d4dc0b54bfa03e086d0128cd7c877e89255b424b8fb6dfb885 SHA512 7a6c93fd5d0ed11fce61b5f56ae395116f9fefe7b8b765692ec3f8ae7bd01dd0ad3ffef2945fbdcaf4dac033a1efe3328109cd0e058c0f31e85be0dd65453703
+DIST gentoo-kernel-6.1.74-1.arm64.gpkg.tar 65628160 BLAKE2B 6cf9280fd9a0be7e8cfa06ccb4ff788911fc90f5e0a08fcb3d3db94c9cef3bc08e5bb37aa9bda7c9c3aef33becd568154d868254c563cf5a32588de5f68eeb29 SHA512 31c7a1fa05bf19af259ef114fc9ad13d8e703c72347c91b7c9c883a5fd60366db10a3d9e1b083f09dbdd9f8515e9597a1a3ec30ad8c5b6adbca385a7a97ff4d2
+DIST gentoo-kernel-6.1.74-1.ppc64le.gpkg.tar 59883520 BLAKE2B eb135a0383a2832c1f9ea68a4a68dce8ce64ee9834b9286c3caadbf2c3d7f39f019bb6d002f1936a5d0902f702e967607fc220afc7935b7e2be6bed5416d9fd7 SHA512 1e325751f217faf09325113d0cbd3cbcc6620b0df3558d34ed4d9e89305982f9399aa300119e2c4d5068a1b5cfc155f1c750281a1fe6648d3320d3753ca02f1b
+DIST gentoo-kernel-6.1.74-1.x86.gpkg.tar 62136320 BLAKE2B 5f575926d6dc72f9e972f4edd7cf6b5ebbabe86458ae928d094ad1ada0230985fecae7c2ddbe97a40413da797f06e7dd8c67124d25b2a132c52c8d48b3b22fb9 SHA512 b22ba08b909c5f87b89b93b106c0c51de6d7c9285c2ebb6593d9f14d8b7a129589459fd7eadcc5647e8e62daee0b0af86812b9e4e296e7ac484f82072166ef16
 DIST gentoo-kernel-6.6.10-1.amd64.gpkg.tar 145674240 BLAKE2B 084fa55f6227d6e5521ef2395b6e41b5145b60e407f0903af184c262745b25db5f73b99fca9c304e4f33ce89d09d1e50e04c8cc03306b93b41e61c48794ab305 SHA512 b30ecf5b8136d00467c7de69229f470190e486cfbc8442aa2cc48cb9dc877453e8bc2b74a34a9d94f1bf8636626da31c86836fefc1a7e2b084721fb1093e3a2d
 DIST gentoo-kernel-6.6.10-1.arm64.gpkg.tar 118558720 BLAKE2B 5926e70e85e9f5404ea4b2077415744f717d4565c9fcdf5b8469208bf56d0a558a15c4a320b09b1eef723647998cbca6d17bab1c0bc54941095ba94bf7efc429 SHA512 c5b79221f47f814c0d9ad70a268b70bbe0b2b38d9c8d252d3a9be30cb2dceecaf28d621fa3975f838862a03cbee7eec12252ba52090a985d34420aaa2c04815c
 DIST gentoo-kernel-6.6.10-1.ppc64le.gpkg.tar 64327680 BLAKE2B a3ad4f225f87b9818f373dd447032f66ef760d011c6ae691aba547ffc8307d9c59eae812e225defdd35c1311b4ae55a491a355b75e43a72a94442fd65998ae6e SHA512 0f0e87cf92933dafb8cad758af5b5debeb7c507ff03ad9a469d750886020a065db60d34585a59c4355c6bb7a90496ea1bcfa7fb11e81899affc48d1aef78e3df

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.74.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.74.ebuild
new file mode 100644
index 000000000000..1a845828a60b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.74.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2024 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##*.} + 9 ))
+BINPKG=${PF/-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="
+	app-alternatives/bc
+	app-alternatives/lex
+	virtual/libelf
+	app-alternatives/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 ${BINPKG}/image/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
+}