commit: b768c5b032ec0ba37eebe01fd994edb290126822
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 8 11:29:32 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 8 13:33:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b768c5b0
sys-kernel/vanilla-kernel: Bump to 6.1.109
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.109.ebuild | 134 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index ba59347e1e24..a24609d34859 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -34,6 +34,8 @@ DIST linux-6.1.107.tar.sign 991 BLAKE2B
00fb8cbf46cd3f7f9a725d8db49d6c1c7318ff88
DIST linux-6.1.107.tar.xz 135181828 BLAKE2B
dce4dbcba63d212f81a7ec038e0c75a37ec06f84cdf5a86cbfea70af87c7dbb0860ba9d15e1a9bdd108b804f3aefd700754d31afb226ab92441ccb63e0b98c1c
SHA512
d72dec68fe4399d444e152e88c8d5e2d2227700108573ee224e5239852d7c01330ff1f3aa060c3ab74c086bd73494e3e0081a9dc633dd7b0580f108081a9ce89
DIST linux-6.1.108.tar.sign 991 BLAKE2B
70c218f764b2bbab0e7f690451a73c7a025b381adfe9b84fd57eb3a63f4d39d71f7f21e2370ac8152e5f539d429650fa5292999283bece3923e8db504a608e63
SHA512
d6c45fb87c0a014a539a5ac8e806feb5b874c48d18968e6936551af1d299452c2bf7d5c0c0ee4852ff450f9b905e58f86ad6d099045c647ac44f5f3458006060
DIST linux-6.1.108.tar.xz 135203104 BLAKE2B
f86cb3ca34cea63c1fdc97a22c800e092bed78175486c4e7a95b310031e044021791f3e1c4d693ce3b7bd7be039ea192b9b978c153c5796474b0fa4d5ee8d7e1
SHA512
6934d134f1a471a313ee5d7392fadeee43d6352d13e7941af9a089d532e8478ded57e9a51691cc9e4f0348554bf7a895812b0b90b5701fbf70f730394b7e3e51
+DIST linux-6.1.109.tar.sign 991 BLAKE2B
a47f2eb60b86a73af2a7edf256288209702f195f0aacd571d58a09918a7b8dc42da344147d2cb9abd2c25c7b2151f653a4bee5945104bff258ea6c5c2f5b09e4
SHA512
f0c6b33621f0051917e6cef1d35d3a727a179474817df2c4050fff9211dba3203cd95c0019797028cd71133f15ebc53fd2833128628be3695ba28b8e0ddd535f
+DIST linux-6.1.109.tar.xz 135193224 BLAKE2B
2ab7151c193bcdfe0664f94040675faec1cefcb44df524074c9b06eeee1184fb07891c1d6bbfbe8ca53b8d52f332a17a14854602ef046897de692eaceef8e5c6
SHA512
a435b89320e8af19532bbd40c30c5c1e1b6f796f062a015f3c1bcf7a30b00eba4c51a568078c6dac9fc60040153305237910e6f9d701b9a7bf86475bd0a61dfc
DIST linux-6.10.6.tar.sign 989 BLAKE2B
e8ab99394db3d9c5da9177f64c6c6e8ab74b5b62b7b251964e2b9a0a8ecfbf6a8339ae8b2e2b9ea75350d08b5fa8f00e1bafebaa35c57f52545d415aef60b0f1
SHA512
bd5555d4c1f02277087615423f1bd951cf9cb18f18b9f65775c70810f0698c8df45a1b789f26b33b5e0f7b8183a6a6ac2aedd9154b1b7eece4742156d6d6150f
DIST linux-6.10.6.tar.xz 145142332 BLAKE2B
e0e2c2419b6da1a6c5caaf9df669a362bdef3d6fb19742da6c5300a6f6d0994259ea2acde7f6a4a20d1e2b71528bbed0e7fd51cbca33ddbf78f2d832a291148f
SHA512
991ec7c7d2d490cb90b182a29e892dae586918eee7f3ff4b6e26f4ff9b31b6d7a31cdc31d25ca12243ecab59787aad75f0056b2fbe6997d0dfd68c357e7703af
DIST linux-6.10.7.tar.sign 989 BLAKE2B
eea3184425313d7b20475540e52b5b59b3f5e8414eeae6c2df219bcea1adb084d6e992509adf7627e1d4409effc817e10b54cbad8dde48b11778a1e0273e593c
SHA512
ad0446b0e08dcd7c063382d8ea3c4c48a5dce8239c6edbea70a64c106546f77ae69a450ae7dea82b5a755dd3311f017bf5ada3913c7daf715fc0393f4e0b5695
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.109.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.109.ebuild
new file mode 100644
index 000000000000..857634f8cd43
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.109.ebuild
@@ -0,0 +1,134 @@
+# 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.102-gentoo
+GENTOO_CONFIG_VER=g13
+
+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
+ arm | hppa)
+ > .config || die
+ ;;
+ amd64)
+ cp
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ arm64)
+ cp
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+ biendian=true
+ ;;
+ 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[@]}"
+}
