sys-kernel/vanilla-kernel: Bump to 6.1.54

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

2 files changed, 139 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 27d15d03035a..0706c0fe9df4 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -48,6 +48,8 @@ DIST linux-5.4.256.tar.sign 991 BLAKE2B c47e8f8c6063f5bc82e0f6842d3953eaa86ff643
 DIST linux-5.4.256.tar.xz 112969128 BLAKE2B fa74352685a56f15983403d1bdb124e235e7e1b3e2688f45725094d100c19b5457095863c6b2e7bca8bc27aa38a523f49b32636de747d0fe3e9812ac75639a0c SHA512 aedc97b5a9810b58af647bdd2c6a666e5117c161d156434f5171c957a638395f5ee7e9d7c75a1de83d8693841d6ccbe45e3baea5ac5fac45ecdb9164a5544df5
 DIST linux-6.1.53.tar.sign 989 BLAKE2B 23422a15489e91f8bfc11500d96fdb54796fcf683e23d2a1f6aa1be2f241ea7c824f6c3d77599b53fd3edc807392c9acbdae2c2dad94d53ff777b147e43a1b1e SHA512 e35dcdf724917052cf5d65ff305c21a736d0b59556ab87f8a4881bb2621ef603bf055346cce38c85ee1768501e40b397ffdf9fa79f6e8b10fa13af2b32fe98f0
 DIST linux-6.1.53.tar.xz 135006964 BLAKE2B c5c082fa08e331ae968e27f6a0aed41f7793ea38c3a32311e4f9b7dda3cf1ce74dfd7f3e4c783f0dd4269b543eddd53e086e523d324da5e7a996aa4d8e6701ea SHA512 270f8e9102740edda3510aa5e8da5943f9831a87d6e9f0f6aa590a5a2fab09b1a91b54413ce936dc3695bea8bfdd8df0721bd9c5fb834b9c7a95653401b2652a
+DIST linux-6.1.54.tar.sign 989 BLAKE2B 872d696f0bc7a110b6503db9ba20e18d55e8501ce0cc98fc9c28404ec2fde11685ace4c8868b88f9da74b3049df63907bee53a6648e4066d59929813dffc852a SHA512 95365ee539df4335e9bba8f87db07bb4df48bb6e546e3f2070fd756c2bfe67ca4908ed086438461f4e8f5aaabaa78867c2c86d380ad45b077d16a3bdf686c113
+DIST linux-6.1.54.tar.xz 134989636 BLAKE2B a2e7fd5f1369247357e53cbd5982df879f5b8d2cfdd9aeb5f714ef75528db2ab7245f35981da45ff7f17ba7b24ac1190dc5e402f5a7e759a4f39cbc61f87b4ac SHA512 fcdcddd3001be94737a06208be39dce4ba31a51ac3f05ef492bfee1827d18a0d73f9ce3cb1b01a253f148a525cd16fc1278a99d25eeffcdaef8da0b64821b171
 DIST linux-6.4.16.tar.sign 989 BLAKE2B 80ee957ebeaf7d242311cb51c358e8fa762873a22789b4bb3a260ccef3e2228c310d3f5f8f05169c782dcaff6519fc18ee0a9c3e5692d0954c9294ee0f8f3e56 SHA512 c0a50aa599be6c04e2fbc538517ae0f32b2f3abc7201b4ad3e43717f8d0d86ae70cb31d3e0dabf38d8ab7066f505683301c70d97502435fb12ee177725a27647
 DIST linux-6.4.16.tar.xz 137890316 BLAKE2B 02a07a8d53866e3e2b369b8c48ef83e4f9af0deb5edfc25aedc99cfb523219155bb76a72cd26efcc0a81b47c87f9cb32fa393891e0b1a8decdefd360c515b41b SHA512 6ff4f95a98c66b3e6fb9e583d913f333076200c00a403b72363a82ec8f0130a7836daa73248489d6e2dc185fc71022186e305f8e78ea73db46c600e8b886a1eb
 DIST linux-6.5.3.tar.sign 987 BLAKE2B 3741f840dc2cd951b78bb32d6fa38e7c9959203c40040b6d6dd230f982958fcc9361f06df1afa33765f37993df7fbcb06d6a58330c183631f26d25c1888d99c2 SHA512 18c3a957ecfd051a469cff6851cdcf51df782d65aba172c9b2be9f9c8089ed9204c52e647c7eda68ca5343e47fbbec66569501caa913df6962971a74ea941a59
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.54.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.54.ebuild
new file mode 100644
index 000000000000..aaebef705bd8
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.54.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g9
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}