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

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

commit:     7d9ef70707ca0b8b89be9a16fda274744a89e2aa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 18:30:21 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 18:31:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9ef707

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index fe36cb931216..561838a9a9fb 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.10-196.base.tar.xz 5560912 BLAKE2B 3ea2ff034bce2b1a5b42080393a
 DIST genpatches-5.10-196.extras.tar.xz 3868 BLAKE2B f027bd1bbb5a706efd42d205324820aeefba91a7f6098d726b7e4abb0778f4b48601b045cd3c329fb76b5d1fc365caa6d43696008454166c6cb6ec21d58bfa02 SHA512 1016e558435900761b6e64b094f617ba3900b027ac178497195744e0954bc8e9adc6de9e73718fb0ed6b5fc9e774e44df0403a667d03deedc01ef31230f0579d
 DIST genpatches-5.15-126.base.tar.xz 4920632 BLAKE2B b35059e13c2c9fab04f23fd8b41ad37dc1eae2d7e8e505c87506109471e0546f68428c06065da496be3a9213a4e3ad288dd507d7b71b5d9549d7f1c60c378ab2 SHA512 3bcce914eaffcae0f732267f3d4cbef1592a4cbce4ed7277e6aa1b791f006fbbd0858e788ebdaba9502b871c0c9750e74df7b05e98f68318932090f7a9cbfb38
 DIST genpatches-5.15-126.extras.tar.xz 3936 BLAKE2B 7bc9d712efe225829760abd48dfac3bf1556750189f99dd77590fdac8d4f5aa1491a49da029e9faf6dcabeb32aa0b2b725223566bddd3d43a41ca0432348420e SHA512 f196a93dc976eba4bf3a8fe5d52229de0e4a4cde31c58be63be35ab65c4753969e4f0ff86b77ef0d7375392b55cfecfa93a4d963d79f3c5753efbfede6a19a17
+DIST genpatches-5.15-127.base.tar.xz 5054384 BLAKE2B d6f7f2c26d4cc35c62243d3e59a6f7c6a03243dcdaba6abc76d36d35f83f2f38618f821a6c42a34563043e1382a448c2d53d6fb52b71195a4913fb80fc602a7a SHA512 e73bfbff7218f9d5ce2ce82ec04b401cf013b8ba58fb08b0fc6a8c35fd146e1e1a899a291b2eb5c2100721f95def82aa2294fb67032143371bd9a4f2cbd0a0d7
+DIST genpatches-5.15-127.extras.tar.xz 3932 BLAKE2B f818f3a46a46793a5726e7931c989e64bd61e077718fac4c7125efb93f4301de930a6fd5c3a9b18cb53a0339539e5973650056dd9b4a4a9e66e6877124bcd925 SHA512 6552611103653e8b26a951ede5b6133fe22d1c3f6d21aa9f381ef309fc82aa2edbfc3857e10066125dd0f9db3b62aa1e6fc2fd9a16e033eed1ec975f4e64128d
 DIST genpatches-5.4-256.base.tar.xz 5956736 BLAKE2B f1f5f42e5383da96ac4dbbe9cf7d8ff8c7194c10d33b914ba36d29e98291752354597951eeea197f11ed05feff4c83f777c49fca71332c2276612cc6b69f1bd9 SHA512 888ded20e68dd0ef134c9558c4edd8490cf73b84fa9f9efc1dc70144ad5accfe560200592dc93ac5d5919bdc7cd9f70a3832d46b9466a136ebe51cce75b069ae
 DIST genpatches-5.4-256.extras.tar.xz 1812 BLAKE2B 3942c845d2159bb2fc927c5f19a3d5fc0cd7abee0a1102e07a4bb657a213527575fac692ec408f12f679e3a1e791087237baaa6199e92d8062bcc4576fd142c1 SHA512 6242d77b0a7de7542395a5461e6aa8b2a2003f77ab81b1931511f36b42b914bad839ff2683154371118bbd81953de0604d23d75f662437686da694dbb610c8e3
 DIST genpatches-6.1-44.base.tar.xz 2683644 BLAKE2B d0264b6d6456fb2e6a67c1240cd3fbb95eef61701bf953df6e25e37a12fb12702b57f66e30ac757f28d9d1bcd0f2fbc38775d5b73922504084ff95f9fda1d78f SHA512 e3777a612facad029782fe63abc702af06197521fcf90f4c80311fd7ad94739209573c7de910dfaeafd88948c2c3f3d29bb27f4fa1069475295b6f5b29e14116
@@ -24,6 +26,10 @@ DIST gentoo-kernel-5.15.120-1.amd64.gpkg.tar 69509120 BLAKE2B 7836d1b163b803fa52
 DIST gentoo-kernel-5.15.120-1.arm64.gpkg.tar 62515200 BLAKE2B 37e13308537e4f99e44ccd7c334a60e3d9e037772bcf86302af868f307a65819b72f053eaa7cee5891280afaf5e579accb73d2e9ad4fed1310ec1574d9aedbdb SHA512 fa11558fcfeec38932215d9ce83fdfcb364c7f3be15f93668c8c5d493d7f44f38c624396575f498c1330f0ed565854c22f85e04334dab65e0c1d402841aa91e8
 DIST gentoo-kernel-5.15.120-1.ppc64le.gpkg.tar 57098240 BLAKE2B d322c95ef94c89116dc51dbc348016b3868c002aba1fec13707fe2d4bf7781043ff0d68b1bc833106c9a347b02f732c5912d5719f8a98c4742ddde59b851a3c7 SHA512 a8197ba844047722f758a464cca25c3ae1d32df5952c29aa33a5da65e25972667931c75442ae61bf9c8dee149b39b074da3dd32d74bcc19f5df8f7e5376a4471
 DIST gentoo-kernel-5.15.120-1.x86.gpkg.tar 59125760 BLAKE2B 6ec9894a6fb8b1ce9281d9ef6358b3aca1eb4b79939c01e526391443fbcd048475ed97d65ea343a7299e8584a2860e3b31c709b48211086d52176851cce5d65f SHA512 6e6d90d96f090e3b6b3c27f0fb50b4cc5be46e3fbcfa8cc7cd786990cb0fb38401a768256b7624bacf0a95f16a815de7f92e2c708c58915b2aedc5d4cc030b0d
+DIST gentoo-kernel-5.15.121-1.amd64.gpkg.tar 69539840 BLAKE2B d42aaea6edaa2930c117078cd0d18aab4ab2174f87acf33990c5c06607bb66b03a10451652497e95987b93ad6229a580d754b85a6f92d8ffd663c5834eb23f3d SHA512 fe91f20e692a298d147dfe7eef096c6d88c545466347adfe573306a620de618bcb2b0bb0425f25e5153163f441bd206a26ceddbe9cbe420e3633bc28c1b29f5d
+DIST gentoo-kernel-5.15.121-1.arm64.gpkg.tar 62515200 BLAKE2B 0359aacb24fc99558ff61493e39dc1cb2b324c9a37d58cb45f9cc25714bf204fdf50edb0625c09399abd2e30965609a9d288024864b3fd237c69a0d67c57b651 SHA512 f66be90de8b144989dd3ad998a6d6a4e9246caaf8770642f1b7f292ff61d8fb31494d2162c76b7e6f5204bda8bc4b00a151c8b38529a4f7a05d35733ae8ebd34
+DIST gentoo-kernel-5.15.121-1.ppc64le.gpkg.tar 57108480 BLAKE2B 0659b4db32e9940338fb37cbab61b9a61629a30b3bfb83a81ee9be5ed407bf35270cd9e430778fa4d524402da9a6ceb947590cfeebe7933390b26c3c2c3be508 SHA512 bc988307d11b34ca2efb59424ff372408e8c103ada84881df89750b5253112ceb112034ae8f6c2c13cd6fc2386693d61f054f83c596ddc1c8facae6d25c3f1ff
+DIST gentoo-kernel-5.15.121-1.x86.gpkg.tar 59125760 BLAKE2B 4d8872361a392faf7ab90475b77a87b1f895603af96fbb8771125b15e1f20f899880491aa7384c8ee5da573f0003a951fa34ec73ecbaac16c4c2e773eec56ca8 SHA512 ce1c9e4d195ac79d22433ad1edbbb5f97922bc027f4d417d5f01065a5a9ce9b07334dae7b0cd2aaa0c00492bd6bb6794fa158b957290a206d3c6c269e2196b37
 DIST gentoo-kernel-5.4.249-1.amd64.gpkg.tar 60528640 BLAKE2B 2397717a13a63f2a2e3dc67595a66882c51224e61618129f9e741ae37ea434f16bc7d5ecb0428a51a5f2be254bf91e79dc08bf5d337cdb249e2309fbb944d376 SHA512 dce3f23c88d192ad5a86be6a6dcd7451d99ec1645fac008233ca9d98947d0ae49eff75c2ff73bb83192fea7bafcd22bc7789e05f93738448efee64876feb0c1f
 DIST gentoo-kernel-5.4.249-1.arm64.gpkg.tar 56524800 BLAKE2B 220770a04dc54e99d3f0d6ef31668646c273235a380763d7e861b9c37da3c36e91a5d5ce1225e48802c369009d41ea74b45d84ec3e0013fe321a4bac96a7a359 SHA512 a49c8a07da208a103cb88b72c0833d7387e0ad7ea30f303353cb6d4b8886ba5ed1cbb3ac7cac51d9ef026f4f60c19146c853f7cce95cbdf42c2c9a96c7b639b0
 DIST gentoo-kernel-5.4.249-1.ppc64le.gpkg.tar 54200320 BLAKE2B 70533946721333a0fea463b6b6d53e6956c8f683b9545c84aab578c8e53a17a39ff01e535f3d22cf70d508bab01bcd525c3058ff4cc65edfa0a73d7a2eb59bc8 SHA512 45f56abce580de3a348c763d4e60a9e3bf6cee0e1372ce78567cfba2275b907851e141d0a07c953d513f9d46e2397ff036fa44c5ced53ba9286a0d945bf6e5da

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.121.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.121.ebuild
new file mode 100644
index 000000000000..83c6a5e4fa8f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.121.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 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##*.} + 6 ))
+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="
+	sys-devel/bc
+	sys-devel/flex
+	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
+}