commit: 0ff65075272219dc129b227d39188fddb8c14971
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 2 13:36:48 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 2 17:08:25 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ff65075
sys-kernel/vanilla-kernel: Bump to 6.1.123
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.123.ebuild | 134 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index d99284eff03b..3b8fcee38d70 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -29,6 +29,8 @@ DIST linux-6.1.121.tar.sign 991 BLAKE2B
a7417d28ecf3d3cb4db0aeeb084b3552f8ab5de0
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.1.123.tar.sign 991 BLAKE2B
12565e86cddf3073f4d98f63e5512fc21177ca6f8b7260aae7c2ce22e597425891751d2d0fc02c148da88b768edc4d06b402dbf47ffe56a920ab1a3ffd3f1e8c
SHA512
58f49089790cf683a14063e780b040876317b6c30808b75601fa57ecd78b41d048554546553b4e663f756520875f496d9eed4c9fffd61ae278e12c4a979327f9
+DIST linux-6.1.123.tar.xz 135237844 BLAKE2B
dfeebf5888a20e19b5cea542210beca420c6fb94a54c337ae9a9587704439ca4cd1dc88c1c17f004018439d84f96fc9454ecb85e4421a81bf14460878141c43e
SHA512
8df7733f91414c2f0dc97482351c39bd9bd35bb38908c5a02f4a8a487adadb60adc7ed4a9db54f9b74285eb35247b6f6fb188fcad4558875f0b09f94725de7e7
DIST linux-6.12.7.tar.sign 989 BLAKE2B
f991ff0c9c1c5ecd7a7ab2d1f2179ebcc68253230134adea804aa95206611ea7b2034d3e653ecb257bc800189720e4c59c30fb1f788fa1bc0abb1ef914a45807
SHA512
261ed11790468b753a45b074fb578d2d3b88277df1c508a8e5e0ce3221ca1f8a9549afbec12e90ef96acf788be4ea7aa82e46ebc54225a51d4ca2a3aead5344e
DIST linux-6.12.7.tar.xz 147968308 BLAKE2B
ddf10abdcc50c077495050bd695b1e6f2547955c8f6a07a689e38a35c205ccc97849a1270be844eb30d07f396eb9af2f3ea8b4ad0c383711785456cc910d4554
SHA512
e8e59e20319346f3489994b92deda5063b558a7445af145f77a3e5bee51aecfe6b7f7f408f7eebf4656d20236c69c0aaee389dae98d07bdcec138fac41d2ebf0
DIST linux-6.12.8.tar.sign 989 BLAKE2B
aedf3bf63936f3c5fa5c92f53dafe3a443a2b77b04e002a2152e7882735cf41c4c423e22acc008decaef3ffef7661467fdc5d160d390582ff6843aa2af16b7f8
SHA512
b610d83a2b85f3b6f5b558ac205abee14e18bab826c79dd1036fb5cad4b2ca2331d20bbc2ea3ee7ba92163cea44e64392e92605703519adfc0cafab235898d89
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.123.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.123.ebuild
new file mode 100644
index 000000000000..4e0df368e38b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.123.ebuild
@@ -0,0 +1,134 @@
+# 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
+ 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[@]}"
+}
