commit: 6e10cf02b84792a64425ea67257b89e43389bcea
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 14:13:01 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 17:56:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e10cf02
sys-kernel/vanilla-kernel: Bump to 6.1.122
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.122.ebuild | 134 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 4d46a2446b35..0e53a9c9d837 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -48,6 +48,8 @@ DIST linux-6.1.120.tar.sign 991 BLAKE2B
7d3736ae920d02b6f3f7735039d421471176d20e
DIST linux-6.1.120.tar.xz 135225156 BLAKE2B
58e084818bdb30f42f7d0ee22889309d0e7902ba8b019a7177e6affa6fe9ab9698b02beacd89a07dfa4af08b80b7f8e2ad82b2db30bae88e278ee6a5bd85572b
SHA512
6800364fc4b689f1089595882b71faa1eb1bb7d4fc7d810e23d3194d8aad0e8beaa6bf3468263b3f940457c3097e0dbd8f824e9a244a747bb1faf1f1220402d5
DIST linux-6.1.121.tar.sign 991 BLAKE2B
a7417d28ecf3d3cb4db0aeeb084b3552f8ab5de061bef8316f67b4e74566d965a0a00d967aff155ba92765cd69cf4256d2de6d94bd92d8f72fb3efe5ff9fd80f
SHA512
a45b66e9d1d8fe20c70e07ca3269f24f75ce28ac6842a2db1afb63c0aa238b155b5f3dc127bec71376b6da5932e217d7fca3a885dda9d5b4455f30724df193d0
DIST linux-6.1.121.tar.xz 135248068 BLAKE2B
8a976caffeebc64d97f6ca0fd7f04682d094f429f42eaf9fc134ba53b50253e3240b8b1da9fe833624f67fd6464f1eea3272f2ac3dcdb9604e15ad12ffed5088
SHA512
5a866e29ec747f3247dec86c3a08c6da63b73bbcf7b94a98e91d001e44f935979e55bfb83b7a17d05e9fa9807e024ea42d96ebf901846c32ba3f1db001993807
+DIST linux-6.1.122.tar.sign 991 BLAKE2B
3fa145ae1bbb7d547c6ca1371466ab7cf7f6d335efcf6c055f2d65ce127f35d23465af5691a9fdbf711d4a8def2f90eb23c26855c30649516247ca4c7afeaecc
SHA512
98f1c1f07d5a6ef2cc4ae18a4ec6b460a4a339ddfec3187cffc909747e4f14c4b8abd66f8f827c4a7bf3e31ff2c666b205dff2f43a714bab6f5481f165edf395
+DIST linux-6.1.122.tar.xz 135239952 BLAKE2B
546d8d0fd6d9574f5dee9a064fc27571fac28a605c8c684756ede1be90e67a4f305cd7fc7ed2c0b2beb138b4b183ac79330899624a3a11395a6c7e1f1715a773
SHA512
e611f2c4467aa8bc1e7379e510490f708bce9c95121f268476add56259818b2bb76e14cf9e3e69e47f947826b3cd940f96f21517f7a1b3e154e6508ae2001c3d
DIST linux-6.11.10.tar.sign 991 BLAKE2B
7786945a39d02727f9f279d5aac42ec2fa641aa1413c79a1325cd3e3a0bc699db35067d95482dec8d0359d55168658365a13b65fd6ecccb8398c948b98c1ec95
SHA512
89f517764b9396cd2d14c5ee1df27477a9bd8e4111de73dcb1e19bac9a64d71011446b4ce6e246ce88d0a19ebbfd2a3ff6ade8cb3e97a05b63b2469d82888fd7
DIST linux-6.11.10.tar.xz 147005172 BLAKE2B
7eaa4da44fd0f6cde13c92a8dffcc3e20d96fc9a8dce4502883835f4c2822d181234f7e9bc684a09da4d499d0a7c5ecaecde29e3fa1e6a3562c4da610757d9e7
SHA512
77d739417b3a25b6dead21c5c6d1bd881b714d6f35b9e102f3e0720b897f9c7686d23d1da700a880bdda9a319f71da5a33c68ac118a345d2c054835cc9d3c927
DIST linux-6.11.11.tar.sign 991 BLAKE2B
43c9f936cfc7838254484ab73efa8a29517bf579afc17b86c76cfaf8cf6a02f80fa04bca2e60e8a0fef1d202354e50cc095d6e1c38d9d12385c0ae090de182db
SHA512
be394da33afaa38f3f7f471d404d0f6cacbebef5a4a881e74276a86357afa3ac10cfb8a5d4d79eb66c6ba79e6022f3fcad486c29d3f72dee4a015e83f8359c3d
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.122.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.122.ebuild
new file mode 100644
index 000000000000..3e7046d330c0
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.122.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=g14
+
+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
-xf -))
+ 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[@]}"
+}
