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

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

commit:     b31e49cd085c9c99dde34253a5f244c1173f0640
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 26 02:08:08 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 26 02:10:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b31e49cd

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 5bf39da107e4..0b9803b84723 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-6.1-65.base.tar.xz 3729228 BLAKE2B e2f41ebb95ca74bc5d37f950e088d
 DIST genpatches-6.1-65.extras.tar.xz 3816 BLAKE2B 78f99a28e607a207731a34036931d663c1815ba00bbbf0d83dcac5597733b705f2239baf44b1b454da38303c7b9b4663c8de9024f7bb51d71f155d5b3d948cb5 SHA512 e228dde9f67ff74e02dfeac5ddea5f2f0122f4a7f09a6499ff8ee27ca1eafbdfbf09a756fac212de49702f01bcef8e25be1872c62986d393aa55cc7274d906a4
 DIST genpatches-6.1-66.base.tar.xz 3766288 BLAKE2B 3cf0a62fbfcd492e5c16b4158bcf7dfaecf7cc8df376e308ad606d8203022e04a0375a2c9a4fe58bf37bafbfd4a1ccacbb8939fc166590089884ba9989929430 SHA512 69418fe7fe88958d95bdcfb142e6350363180ede26cc44e035a0fdba12d2a8cc542a0ed7789572677eba29f9905af8720c8ddfa13e8257b129bfa95641e72f50
 DIST genpatches-6.1-66.extras.tar.xz 3816 BLAKE2B 8b2f2aa2f65d427c4ec39cdb988200d31d360f2ffde6f633838b0c3437c4efe8438e01ccd8e2de57d7f164c32d509e35a8be1ac4818841a7719a3cdce9e47717 SHA512 7f40e6153812cfe74de8ce376d4ae02868b6f246027cbce67e0714a139e60b4aa32743876c180f3b7b07e9b6fd07d2138e21ff5e6ced9571d29bf3e647b615c4
+DIST genpatches-6.1-67.base.tar.xz 3816044 BLAKE2B 9116263f1f3cbb472ad09ad785eb643cc4deb16f94936196c1dbb3d500b6e20447d07d434f4fbc59fe8cfc03076da0aa0ec22a3c6d93e09d0dfed6d6fdfe7add SHA512 609935fec85285a34e4fa6032f552230aeb7aed1caa867d34810a25f68c2295e0a8f886e0a093f111b1623ba364cfd6e17b237d670d42c8c539778810a02f681
+DIST genpatches-6.1-67.extras.tar.xz 3816 BLAKE2B 6aa8e9614221c2b9d84df9f75e5b8eb530ae8752b406ad698be86a8031b47940f9efb1de9bedfa0e466d0bad32dae60c5c639815785353a49e4b439de79a80ef SHA512 a911476dcfa9767f4adb946bcdcbe475e78f83753a7880a7e3a96aed347f1ec520ba8d75fe4e5565b2aded25965cecd3c7f79fa12009af043f7408200e27189a
 DIST genpatches-6.5-10.base.tar.xz 631564 BLAKE2B 7a9fe483c7a6a040af5a1fc0fd99dd7d575a380240268bb61d68caf95613d53fac46edf6cb18633b6dd2e803c9360d3cc13f0160e6ccaf811ac8420f7dd30771 SHA512 506abb2a66c51e45ad3ebab0c3b921faaa890640c7236eed377aeb27dff9da552088ea8d8192b4f2e142c510c7d565a5c8431444fb39bd82948ec0e696c4b083
 DIST genpatches-6.5-10.extras.tar.xz 3704 BLAKE2B 4bfee3cf5f3af32c02f4df2b91437258a4bed38c4cd1fc8f8467020ffe1835ec86dee58a10d2e1775fdd6392c6a28552ea3a90ff5fd36504ed43cb7787ea7e5e SHA512 48589be11fcc969fd3f46475f8aa53047f191c5fec66918e84d178e14f531c209300808f7c2ddb479fb8409a344f205f59b72dd18b6d79d1ca924eab10f81f85
 DIST genpatches-6.5-11.base.tar.xz 690272 BLAKE2B b647ad0ef234e1470b72e4cefc091b48bc81b0591fa41d3741d25360d6c92d6b47cafe35a06c5246806072d11ec4839f76bca382f8cf38d0e76ddde9f4fa3bb0 SHA512 53da072920619acf21afa89f3df7b24c27c1798a1244aef3f21f76bcdcb38ad1ad79d07e3aba62b44773af57162c89bb77eb4c19b7056e0806926ec5951d149f
@@ -40,6 +42,10 @@ DIST gentoo-kernel-6.1.59-1.amd64.gpkg.tar 72417280 BLAKE2B 19c2c593f3b792d8a019
 DIST gentoo-kernel-6.1.59-1.arm64.gpkg.tar 65402880 BLAKE2B a490ba7a7db6861929fc912df93600923b3a8b69c3131d96ec4c24f9e7880e47db9f4ef587e27d405a413eb5a9573db9adbf9e5a205ee902da363cddb84efe01 SHA512 d0bfeae3aa8aeb7c8f75266795b0efb4ee76696254b0420f859d8f79a11f76e1a10a4fda65ec77ff56a4c65c093d151d785e5cc2a86818c2b8ead747f128f5c0
 DIST gentoo-kernel-6.1.59-1.ppc64le.gpkg.tar 59770880 BLAKE2B f8945e524039a65739082dfa84f1db7d2863aef91d8081c8500522f090bdd2ad12f5aad062286da4e41c1bae1a76333358c48cd1b57fe707c60cadefa88a8cd1 SHA512 213e3d681655b5fd41797eac43e7849bcdc0259797e733dc4eda18cb7fa080bf7e1cc56daaa18279f7c85692b930df5d71c8f86c5d11050f6c5f5b0881c05e69
 DIST gentoo-kernel-6.1.59-1.x86.gpkg.tar 61931520 BLAKE2B bb0466fb5ec12b0ab979af798331d4d5de70521b9fd0f0361e727de3d0fd816dd6c29eb5fa069594bb1e26c2ea1b9e8869bf8145b95834a7ec3df1d2c3f0baf7 SHA512 3708d7201964d4b27013e854bdb393f42fce476996d91da94c0572540b1f96f9edcc3da7e5df1d6415839fde5d3d1d067ca1d50d82508e38128d9344845e590e
+DIST gentoo-kernel-6.1.60-1.amd64.gpkg.tar 72581120 BLAKE2B 3053a4c8707436c3f47921d9b438f4c2c59d0a6a53a9aa68cef873152da6c959027c113e077c8281a2143e7d7aba4113593e4513f4b9e0d842d08432e7e3aa0f SHA512 89163f836e1675fbf78c75cf83c7a8e4845d6233e55c40f194f46fd53dd43aaf2f2a797689481dff835cb2d5fb57b36be7ef94c8c3b497badba31166f4d474c1
+DIST gentoo-kernel-6.1.60-1.arm64.gpkg.tar 65576960 BLAKE2B 77a2d1fe197186620cf9cf6d66eb11e7a1ad72a4ce26783f686f42ddbe18005d38ac98be3ff9369535a9c0c346536325b23cd037e35d24f25a1f58cb26fa828e SHA512 9942ca4c56a3d813f9e38b91b2b1cde6f53e506e7deadcd5f772da008ac658ba5ea0ecce546ce45eadf7008b9dabd8bc09f9c1d046c83ca2632b29a87fe99311
+DIST gentoo-kernel-6.1.60-1.ppc64le.gpkg.tar 59842560 BLAKE2B 6da8e5e5e35f3ceb8bf47ddf6053396d920f484b944dccf344ea102b3ff322a6180b5e1c0948dd47bdc57a0e5b5ed10628a47c59434dac736f44dc5fae07e9bb SHA512 2967b93cf94b77a40d5cf190fd0db855ff15e15d18ac63ea3831cc10b865238c62208ceb68def7681e604b5beef20ac860738eb6e8a2c2421a565156cc97ec82
+DIST gentoo-kernel-6.1.60-1.x86.gpkg.tar 62095360 BLAKE2B b6fccd8e5495df2cfbdcb56e1a37db2c35b0d7a1773c756a25fa0a04aeda3135d8d76b1bbcaaa4c082035573e7d2da1b219827c0728bd8ba6f31fec78f8a9b73 SHA512 43aa8c618754704f0719cf713b63161a604a8b64730ee2ecae759ea9d6ba2cd2cfd7da552c7d0b7a6210607e86bbc332a1ef62a1aba8046597ab0172bfebae6a
 DIST gentoo-kernel-6.5.7-1.amd64.gpkg.tar 83537920 BLAKE2B 90f9ab1b3214bfbfbad8450488c52e60d2534f9ff4eafcaf5d3c219b2d48b39590c3b5456ee10db41038cf0cab6d6468b4e8c53f714098d1611511ff5ee1cf69 SHA512 0ca65fb868f87843fab41942d7783a385151adf2ef203b17a9ae7753f85392812588cde1481b86febffe371ba71d0e6482cfdda12b0d4dc607025375a1db0e4a
 DIST gentoo-kernel-6.5.7-1.arm64.gpkg.tar 73390080 BLAKE2B cc4e26bc1a73405e4039c943cb0ba73bf215694cf5936e0f20bc9356c9dc3adf042901c9db771cfb586ccc6f524fa444539fc49019c77b4ac2ee0cd29dd97ebb SHA512 4a55ef7726e114f180627d3c0b1d7077812f7920a7bfc726e28e44d810f2a9af1bff74a8c0ff73d396247ea865c0045c49fbf054961e620127f12d483a9630ce
 DIST gentoo-kernel-6.5.7-1.ppc64le.gpkg.tar 64430080 BLAKE2B a79c67c1bef8d40eba08a9afde1919276eece3748ba35940609c2380c09926751bcfcfb6c415f869183e39e82758f9ec55feb401a40f5040c707ff1c879c6497 SHA512 9934976e2d009e72c63efeee9deba67fcef7a2e624d9660cdaa812a0479144931efe0663aa5e07124e0105277f8930a6bb9ae3f2fc90fddddb9069da71c51055

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