commit:     56c06000d73401de084884f33f2f02f29da1d9f2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 19:54:38 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 16:42:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56c06000

sys-kernel/vanilla-kernel: Bump to 6.1.73

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.1.73.ebuild    | 137 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index d28c8c1df8da..b2401d43e3b4 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -38,6 +38,8 @@ DIST linux-6.1.71.tar.sign 989 BLAKE2B 
2e6ebf3fb8b0cb42f1a23620a0eec961287765ab6
 DIST linux-6.1.71.tar.xz 135083476 BLAKE2B 
7248500afc76b024a07bed56418c70b1e7c6729836b7820a95ed7ddd0ebdc83b473d91bbfbe99e352692702054029dff157fc5dd345b9ebaf8f18d0e39f0e36b
 SHA512 
ae0633231fb88c68406944a73e751e4d6409f60e342d6ca32d6b84a70eae9ce52dbb2a50e60947ec52fef7ef00ad6ffa31361482341f2e3c0cc84815ac405ad5
 DIST linux-6.1.72.tar.sign 989 BLAKE2B 
ae4fc78466ad35ec01110e7519612ccb5db6249a9db2230cc0e3afd8d3c06d91e6d648d33d241d33037b9ffe241e98f388c6e8055586aa8d32903527effb207a
 SHA512 
b641965a04a0dd90baca2b11b4d7b5237c23ec4afd7f9c8e4ab4cc5030f02c83d43fde7358683b9035751727030c861812cf2b67e45779aee822187c2b7c292f
 DIST linux-6.1.72.tar.xz 135059944 BLAKE2B 
14c55436d9e676c6ace598c54c353c3a28783c5984acc45e9668fe0da1ebe17c7f7a05f12b7fe2eb439b358423da4753138c06c1ba041bed78e4d3786128042b
 SHA512 
b7ca2baef22dee353bd27584148a03e11d381a552288bb616252dc09186dc351177348a2bf564b555f6ff2cb790580f82f2a3734c7da3cf3ce6d39e6ac35cc41
+DIST linux-6.1.73.tar.sign 989 BLAKE2B 
a88a3533ac40e4f0d70a152bda04e0b6951d8974589e5ea73c800d0df932836d9462511ddc740f315a4738ff30e630cbd50147876adaf2d644b3c126e4798614
 SHA512 
b805ec629d7c62ed5867e600e2bd9b6bdccd69c57d6dd71cb9394cab08903b107ff704e53a3b33026f117af729bee3faa31fda30d3e6e7da95f5109685a3db94
+DIST linux-6.1.73.tar.xz 135067796 BLAKE2B 
9661a7bca565c094b2eda219f6ea83692db185fa8cd444821b4bab73c7145e85f3df77fc70f175e63f5b58c5bddb1130ad478f435515037275325eabf9806a19
 SHA512 
e9d39bc20b76100a22889dc0dda7d624594d5c0da223fd256ae0ff6051fc2330a9ec2ca062825187ea5c80890d44473daa15bc87bc54cd10c39b848cb92373b1
 DIST linux-6.6.10.tar.sign 989 BLAKE2B 
dd8064c58383efa9227acd2b8ebdecaaf30725e7df8a33810df07a7290d00da282a9584f78fef585e7bcb8f6922d550b99579f59863061aeeac5d5c87f2cce2a
 SHA512 
ec5ccfce8e6bcb5fa16d1bc30f4bfc9d15ed4b88ea455d16f5b043e764e2213c1913288a8226c9fdacba835e1cf164c589f04f0b76d38a8347bdcaea0d4c9fa3
 DIST linux-6.6.10.tar.xz 140042308 BLAKE2B 
c71e651438216e86e436af032cb529c029351b72b460568bd75858f835212360d646bae27caeb3140a4234f4155553aceec3aa94d761e3a634be7c164eee86a4
 SHA512 
5f2de63021a30e9507713ca98515fa1de15f4958ba115beb2e2a4cf331d00f7e6520ac938f6a4732a68fa21da8c0e142b5db1c9be4f604a14bddc20ea596dc8b
 DIST linux-6.6.11.tar.sign 989 BLAKE2B 
9f711359eeebe63e6cbb53014d1d29d4e3f9b7a6716671619e81631dfc81a17ff933888f08a7120bc872c3646a9eb31ebf35988e999e2256c07ba3c9aa2efa1b
 SHA512 
38052affaecd3933d2e53aefe00d51261a49d2dcb1c03d7f9e0fba0065632ef0b74c07741b6886cf00df3f564c68d544ee87bfd3281c344225b97bdbbc18e6ff

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.73.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.73.ebuild
new file mode 100644
index 000000000000..af7961f3fb66
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.73.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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=g11
+
+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=/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[@]}"
+}

Reply via email to