commit:     6b42cf3d6e45877c5277d6db0020c05f34cfa16f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 05:04:35 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 08:28:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b42cf3d

sys-kernel/vanilla-kernel: Bump to 6.1.82

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index cd6c5b6283ee..c68bb010d332 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -53,6 +53,8 @@ DIST linux-6.1.80.tar.sign 989 BLAKE2B 
683ddc11151eccb87885ad67e1d80464d5562fa3b
 DIST linux-6.1.80.tar.xz 135109256 BLAKE2B 
d15cd6405dca8ff3c17b1a062e704de6a280efb843c23604ca6087340fe445ebfc3996d9b2dbfb459f8c1e0f0c84921c38650b9f6a1826a59e38734c2b35143e
 SHA512 
6ffb13221e64810a5d0aaa073b440ceac58a6aa2d93a3f9c5f92220288f3eb1edba8c5ffe7173b91d66028bdb1b1e2648f3123e5d0d536a116aefa3d65e9fe0b
 DIST linux-6.1.81.tar.sign 989 BLAKE2B 
29618761c2ccb8747ba3ad77ab378193ab63ad689ce7db0d55cf1e588307c54eb6f937d2c311faf94a1f2c94e69677154a38154515c532cc383b5a83ac491584
 SHA512 
7444ad331b208a6d4c9410ace57f3a5b5c1347f51f00040c33d0940f76530aa1f0fcca1eab72ec9e7bcdce552125fd8e0335aa8732b39566612df814e8da8188
 DIST linux-6.1.81.tar.xz 135100548 BLAKE2B 
4fb34946ca03096cec357f0205b4c2c4a76279bce0b19e1c7644f370a0c301b05eab30ff2b272e43b41e808fd568d6e2df197535b84d25aa28c2af05a12677e5
 SHA512 
019eca1bdd822f1ed65f6f7f73ab101c7402d61e612c88cf9afe10eae96edca4a8839cd85f92b7062de62dbb8840898e668a40d2d8d8cda611d4dc533355052c
+DIST linux-6.1.82.tar.sign 989 BLAKE2B 
830f273ac8d8cf3c8c97643ff00b9a61d6a3139e291a4761447d266109aa49e902bbed210b820c9260dc30d093ddb90be42a8c497fdd052ad5cfa2a658f3d7b4
 SHA512 
67b3ff8444226310bc756123c3dac935437e3a57059e464b7159b7b1815b8b993bf0d1464f02983f06525bfe3a12514c03b36eef10c537b7e64faf58ab56a366
+DIST linux-6.1.82.tar.xz 135130948 BLAKE2B 
09b847ec74bc4b89c85b29df30479854b9d7479182dc3701682ca1280f46b2619f264b723cfe2278322983922045696cc21343a34ba3114f115a4d3f07e6a491
 SHA512 
b77ef041a504548d988d1335bb28390a8a829cd62f5d852159222de8aa14a2d8bd9cf60e06a57353ed4ef761d3d251efc65b118c78092fd6c5e4eb5f619362c8
 DIST linux-6.6.16.tar.sign 989 BLAKE2B 
c221ca55eda0e14bda90972ac53ea8a16b163bdfe4724ba30b1497d17db9cc7b7a38c02773563df77f05facd9f1d157e3a93cb447f1b991539fcbed68acab063
 SHA512 
d9cbf6dd6acbac3be93e66fa22f50ba3817db57bad653ee937692ce68afecf41ba8bed8e36fe18daf74db8ceb222f4774c9c58c36a048ff064ef6f7582690263
 DIST linux-6.6.16.tar.xz 140120184 BLAKE2B 
4fd12cdf4c11d1a4c01531acbb14748863ed15671873d49eb95c79dbc01c4dcccbfcd30318794489249868ded31059dd1ad16ad76e29db6d364ecdb331e91baa
 SHA512 
3823a776f8e4aefdec75dce7c959adcb038ab0776d8d7e60fb79626d2d9410c0a334df71b1cd10499ed9ba82d7e50cec415c3f2b821b33f53171ca00b1a3b7f1
 DIST linux-6.6.17.tar.sign 989 BLAKE2B 
d537c69e3439d180266e66884edd75db76c1d2652761eb1e10c4c803fb263e525571c08ad963169bddfd215af85aa0761c802fb36a63117af1a44ef48725b3d8
 SHA512 
2f8973b5af67968f6e8fae31c579eda2a0749b819f3bdb8f53a0ed8bd3fde899dc9f208e58c6bc29d0fd969056b0ee84cf46284f0e033d9de5406126288b02b5

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.82.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.82.ebuild
new file mode 100644
index 000000000000..af7961f3fb66
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.82.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