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

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

commit:     dff88933af4a1ec03bcf3d1112155b462fdae8de
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 20:00:15 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 20:01:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff88933

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.18.6.ebuild                | 135 +++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 945088f08a09..488f8bf9ea8d 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.15-53.base.tar.xz 2200544 BLAKE2B a6f1e11186e771abe56bb453d45f
 DIST genpatches-5.15-53.extras.tar.xz 3932 BLAKE2B ade13a83b27b14cf19f455539599aff1db3bc6caf99d07e746b292be702c49591519b63f754c4651ac3e0e867412cb5ffb588d5056cf6066c193e09a0c3feaf2 SHA512 438905963b586148d6385f24549343a6fc4d623f24aea089f52af44f772eaa62f0602d729b0232620d8ca08d440210dc7dbe7b5259a3fc232d603f574b5bf714
 DIST genpatches-5.18-8.base.tar.xz 440848 BLAKE2B 8a965867409cc340b13687eec9c7391bbaf26b770ba8d4b657b923226a539b7b68eabab6f12bae4bed09a0d198917373a6ab4f707831c652e2461a49f8dd4981 SHA512 057a00d62f4d8ba7be4ea26aeaa4bfbd5581b22ded85dae71aaa693621eda17532ac00bbeaaea1689f552ce2b95a04e9aade603f6236c2a265aa8fea8231c5d0
 DIST genpatches-5.18-8.extras.tar.xz 3924 BLAKE2B 3f575b12166621c67c9cf6ee15a76af551a039d142a85678abc10829e9a573641be8557b9b606352d46fa4d123e95071b2946447a6f53afef5b37eec5f342cf7 SHA512 7aab8d9d18dfb6129ee0e995450c9d9d759545a9fa2cde1d26dfc03d677b9133a310f3943cd77b5981830a6a1cff59463e85759ef5cd68bcb2838dd96104f590
+DIST genpatches-5.18-9.base.tar.xz 495452 BLAKE2B 244e049522e9b8586081b9eac59fec51184c532bca70fc1d451af1ded646df9bdc7e047cea0963fd07ae8aa04bd4158d64854a2d790ec90be37aa467c7e8b646 SHA512 b90abf747ae92bb4ac7ef94646aedc21a89080d10f8aecae63821d59c0ac29b3b94c0fc6b862d87eb8b86442c2d41cfe16e3a1341d3c146d2b3c678c2f2cdf9a
+DIST genpatches-5.18-9.extras.tar.xz 3924 BLAKE2B db49a915b2d7b6a357cbf27ef1185c936ecd6c8ab130d5fd548133459a2fb9a4037741dcb88ebf80da947fb7e252eff22bdd2ccb5436921f9f141eba085ff778 SHA512 a1ec3e8b1599401bfdc29d6acb3180ce9522df52f6d934c03208af86894f2cfa774b2a67f49adaa7eeca5f7e40ee8dbb45cfa2a7d02c895c0fa9ccf3355827c5
 DIST genpatches-5.4-203.base.tar.xz 4798932 BLAKE2B dc918ca3e7538b66b87a8bd8d2c673f56b71706d913007176de20014a2ebe38889541aa3441af7f4d6db69044779a1e54dadc122e59d180c15fe5131b8056aca SHA512 975dd953d5baf0e72e5718dd4979657597adc380559f41e769e94d294a08b272ba06080517d134a3b2611a6d4779cc3d8b423d869b7dec5e6c43af0634996871
 DIST genpatches-5.4-203.extras.tar.xz 1812 BLAKE2B c4f67f3fcd08b6d845c7fc6174a747e805ee2614ddc2733771cfeec8df5535a7e0a6b8c3528b23c7cd1127765094deb565d3e1b96bda5d1882510cdce4b050ea SHA512 029f4ba2b1fc2c581d343e9847b926ffbcbcd1c0a5cc45c28f35f2ca1572cffaf6ce75a9bfb42d2cd94f6a93ab5bdb8a3297636ddeb4be4afc66efa87a55d7cc
 DIST genpatches-5.4-205.base.tar.xz 4658076 BLAKE2B 172fc1760b7636d6d2de9014c36f792e7e85f81d36748e7fed87f6784647e3488acb401c26abead8703319616c83ed09bebaceb47f8f179b91ef3af3a2b4dc37 SHA512 03a2368388de8fa0977f0af58234060d2ce156d23fa5d954e49791182ad78d2bb66c7abe319323f184c3d344915083c961c8d7646f2ac7faa56d85a21fcb7c9e
@@ -33,6 +35,10 @@ DIST gentoo-kernel-5.18.5-1.arm64.xpak 65223184 BLAKE2B 9b54ac0556c6515a9303f6c6
 DIST gentoo-kernel-5.18.5-1.ppc64le.xpak 59550570 BLAKE2B d22a29421f489f9e27018b166801fb039b7a7c58e45efad3eb2841a2e9bc2e554da116c469db7ac0845debd86969ce975ed5c5a4392e33aa8b3a626882a52fc4 SHA512 005450035299a52699bee929bc7135a25536f633ebf23cee71ef771760c93104fe8ea63016e367fa7ffdf7d1b42b8f173b8a87c6a2aed7b868ff4bf35bfdf767
 DIST gentoo-kernel-5.18.5-1.x86.xpak 61833886 BLAKE2B b793e517ac55a2b493e20b4ebd7dd77adeacd2a8d43b5a5e8dfb4af7cfe1498872c9477866f84f0d17cf80b69666aebc8fde8e2a1a037c4d584d4d24cf7203bd SHA512 07e1b5181e424e970788584239a1ad4177de37900e748b0b431a63938a2592364733b0a856a6c839c0631a5566f53d9d5a6bebd03715fd1c0809605c700eaac4
 DIST gentoo-kernel-5.18.5-r1-1.amd64.xpak 71567319 BLAKE2B 2eb9f64b4071279834426f79aa818c78a167cb1c2b9672bbe6c87d761ea2a1620259726ce5e7a781deeae2281108a520e44d6d28bc37246738851fb9e8bd958b SHA512 82ac49a67cc1fc863baf205362d64419f13be31f0e16c427d1d48e434284a07ade0933e97b8725053d23ec31490d3b28312e8e7469e250a670bf9d4de25dff79
+DIST gentoo-kernel-5.18.6-1.amd64.xpak 71610186 BLAKE2B 13c55b184b16a7ac7bed980df46283f243ab41bdf3e79b59ab0bfca39ce9b275976b2e1a25e3edd63cedd3f470e23edf8903543a9637bc321a6389d6793b7155 SHA512 37e3f66cee9b14091836d7eeb4563b09722a983847019f1b6d1a5424beede607a899da57b189ecc138687b5a0daa249f7c677767b764b2951454d2e0a642c9e7
+DIST gentoo-kernel-5.18.6-1.arm64.xpak 65223232 BLAKE2B 09fe7171bd037e50d34ac25e1a25188af37b5753a9940b36195a0ce29d356b46666ed4acaca6fe8de0e3b1c571591377c77c9366d21eb1155fd24a7ed3c8b0fb SHA512 b4ac8c4d997a02e24bd4a1e780fcc3732232183d31bf2f861431ae3825644287844eaa0d5d98868e8d0eb730fd4f23c6daf37ca8783b01f9c25b96b459391ef0
+DIST gentoo-kernel-5.18.6-1.ppc64le.xpak 59443796 BLAKE2B b629e0230c89d8c9e7dcf8cf620dca6b491b1e5564ebd299ec0029b6943e28dabda25e14d0e593dcdb60cc7432cd31414259bda915a6276f4a772d15688e3cea SHA512 c8a2984fc907198de0457f4b270a6a9c54896c0e160689cc7de79d28d205c5abac9e2e23cbabf1cd61178fd3637619c8d81628854aabbeba79447a1386588c03
+DIST gentoo-kernel-5.18.6-1.x86.xpak 61810085 BLAKE2B 164757a93549fec587a6dc17de0b5f67db8b0808f8c4611e1e80f805167772515c01e45f63660f11daa64752fd1cf49ae728f0e1ca182350a632ad18144f9adf SHA512 5b38f815999defa18d4f43229ca4deb94c366729f090a0a97229c560f7abb8604ab838241db50be37a541728ead3dfb96c7d6eed5e8e6b5b90ca072eb3570dc1
 DIST gentoo-kernel-5.4.199-1.amd64.xpak 61557691 BLAKE2B ca249eb416d775e208023e555d6064f06b92ceebc765807faa9789a2a79d00670b95e7c6ac1c635f131e5b8c8dd38b47a98666b1cfcf9a0b8dcd7b5ab3212332 SHA512 51d3a1978088f3932127d10fd91e6219ccf2bebc17963751b57977c036f878aa13ba6d55abca167966f3061b5f0e6aacf71ae2096e5d6dfbf3c5fba6da3c2aa1
 DIST gentoo-kernel-5.4.199-1.arm64.xpak 57705946 BLAKE2B 882c6b7b3444c2acc04379cfdf9d70d373c04496f9c16788e1b150851c7f64b76bb02e1fa5b77051ad50eca623e0bebc3066fa398622d82b24b6535158817cc7 SHA512 625852a1a45afdf0436025fd1984a243ab4b2de1e49bdfc323b568f7c7e0798d4e88677fff90cb83b4ab25cf311cd7d2cd818484880c9e64dbaae414495235ab
 DIST gentoo-kernel-5.4.199-1.ppc64le.xpak 55122976 BLAKE2B 75bd061e50e6528beb4436072b4d13c9f224ff56e05c08ec971af8d03a4b8a0e93bf1654eb82e78403af7e247d532a707fb5a8af9c47aa4b7996d5ee839a8ad0 SHA512 d10eacc72d067ed7546c6622248e2dba8a713794457cfa1b2e1ff318fe8d48793c3e6e46cf78101191677ac656e5d9960620bbe0ac4d721a36111d9f9bfe8de5

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.6.ebuild
new file mode 100644
index 000000000000..bec229c85248
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.6.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+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}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+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_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+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 "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv 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
+}