commit: 933b25adb81d66dec1eb3546cc16f1d71f8fe3ce
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 8 05:28:28 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 8 08:57:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=933b25ad
sys-kernel/vanilla-kernel: Bump to 6.1.130
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.130.ebuild | 132 +++++++++++++++++++++
2 files changed, 134 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 7f7f24fd7e29..0f3e67d0cfac 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -29,6 +29,8 @@ DIST linux-5.15.178.tar.sign 993 BLAKE2B
b6b5d98d5df48b20b051c28ef4913ffce45985c
DIST linux-5.15.178.tar.xz 126714520 BLAKE2B
6310e6f2fb5d8167374d3aa2f73f543447d60a72f939f509fea5ac88c9a01ab8b29b102149eb91c151e24af7b6036068033eba9ad4d3150f86e2b8f938f1e399
SHA512
6ee4890ec988a44158fd42d54308184ac7c697f1c0d0a69836401e42d422de5872965fc8f09c7032a069392af575e0f31303113fe354a9c9f8105102717bfa2e
DIST linux-6.1.129.tar.sign 991 BLAKE2B
0bb30f02ab11b585b2c4501e904ab6a198c6b2facf574d1ae3b0f028b449468b61f16dc884b305bcb85114017dfec92e7d1705b9cde5ac5bca10b79a485ff915
SHA512
4f40ecd3ee1d1adbc1a45186d78629fb3c70234a8554d7e231480dc9b8e30c2ac523ea12197180dd424886a5331176fb8bd305e7fdd136f0f56331edf024cf97
DIST linux-6.1.129.tar.xz 135266412 BLAKE2B
9e865a581cad529fc7109cb3e33f3cfaa428b2b6dd236789488e834b080ae2c2a155aa326663fdac11f374f61a223a1e216c6f9d496aee5e903f25df4961d01a
SHA512
dbeace0a2a3601219ec927df31158f4f83a8c4830ec41a59b5c60cbfe2b5363f02586257ba47abcf09c26f0f8fa5a6a77db97f9aca2337841ab80aeb0637aaf1
+DIST linux-6.1.130.tar.sign 991 BLAKE2B
b265afcc1946e0f33c58d229f0478bd7963807efdee1e45d2cff2f1badd095f03805ccc02b8e8fa5348d302e73a244505865779bf630d9af87683e8e0dd5c6a3
SHA512
df72a271bac993132492d8d68be39f4acdd04bc4986521990821ec53435e55a80afa9ad3dac5299d3ee02cc87def4c48ea4bf0a593fc7fc80cee89efefbd6c38
+DIST linux-6.1.130.tar.xz 135258000 BLAKE2B
04c4826d015c7f0d38ee67f1a139c60d3f863d215352fc7cac85a2f907db6f09d02c7d6fb2c85306d3333d8a7baf7be96450702a8ff75453b6108f3573e3d809
SHA512
546aa361cdda1721509064c8b8a2e05197b4f06d36d84af3c7fd9c165cf72bd2ba6143a902a6c0f6400b38bd0090a67b751b80638c178e56f7f72f87e8a5c538
DIST linux-6.12.16.tar.sign 991 BLAKE2B
1cb2ab38031cb9a4523388f6bbddb3ff2536cf8cdd10b56b96c1eceae3f3be3c1ac3e627a5ef872d1eeb8370bb36e1a7306510e912508ede9bffda782df60ddb
SHA512
fc5a5ecb830bf3120cc9bf09e597d1b3701a417a82b728500cf6dcce7b162f47d04f065c915e5b0bb2c9782e29c61d81f3f7a74a4cce76d4b1309b5e31ecc913
DIST linux-6.12.16.tar.xz 147993844 BLAKE2B
756e29cc878322b961957f4b725806a2447c9de83799b57c5309106e45fb8aaf947286ea15a0ad7b9733e96155a50ad57bac5a0a7bb54df11dbc924bffbe472d
SHA512
744b985df4c63e27e01febec41fd8dc24f1dfdaa45f12f3b044f45d457718ff3c31bf43abc8b6513d486dfea6390ad5ba342b8f8a53030dd30a90018b782b917
DIST linux-6.12.17.tar.sign 991 BLAKE2B
c27588ac039e6f589cc5e7ed50861cecee0e702de2e7eda7a5b2fa86bba479ae867159cb577fc6e1290ab5d782118090fb47e8854f23e0bcc99335c61c1e5dda
SHA512
468c561acfb5eecdd22c485cbeba3a569eb3574699c3e60c90221384f624a9f53179fa6ba882231e26dc4140b094817b33535ed2b46bfa527015317e00fcc12e
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.130.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.130.ebuild
new file mode 100644
index 000000000000..f922ce9dc716
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.130.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2020-2025 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=g15
+
+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
+ verify-sig_uncompress_verify_unpack \
+ "${DISTDIR}"/linux-${PV}.tar.{xz,sign}
+ 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[@]}"
+}
