commit: b8c20ed4a1e6c061260a9e372e9ce67d560525e3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 01:43:37 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 13:16:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8c20ed4
sys-kernel/vanilla-kernel: Bump to 6.6.29
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.6.29.ebuild | 143 +++++++++++++++++++++
2 files changed, 145 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 704a195c0058..7903bf8b7e6b 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -32,6 +32,8 @@ DIST linux-6.1.88.tar.sign 989 BLAKE2B
82761c4c89269c66d493eb93a83c6964a29ded1eb
DIST linux-6.1.88.tar.xz 135145404 BLAKE2B
0ac898718d521af80aaaf59e7c85d199006b155cfd48e3a102a8b11162eef88eeb388265970f211cf33655bab71303364b5b81f1a32e2b7892039843c14ee6bd
SHA512
ba706f7c2c09c00413f919092d4ac1da67cb2f922ae63ea97932bebbf1188d49aee3bea08ef61df1dbe7b0c0ed6bf3b63866ce881f53edf2701f7da174fbc958
DIST linux-6.6.28.tar.sign 989 BLAKE2B
6e33458ee45ac75a58f1c40d2684d32d791a828a6fe9b8f73f47822c900f179c451c8782c187911016a277fcaf8d5867b690fa9d047b8cab91231cc9484876e0
SHA512
a74f1c948aaf2096f148df2d0adffd4ee64610b8552826e90365f3c95e3a8c6ac0c74766debf81bf584fec19da3dd198ab125c79443ef4a2233abecc2670d3bc
DIST linux-6.6.28.tar.xz 140212188 BLAKE2B
688c9b46f36a0ef8dedbfe27681878216e9b11faa05bb3f8a5f257d6536df2a3260c2ecac33d67b6b1a27dfb747a86ae8911a0bc2c6376f062fd04595e05b199
SHA512
fdf6def06de85656f8aa010edfb8b2f7f71cdeef9a70b5b35511833fbcf0e4fbfafb6224acfdf475975bc4bc8f05d0291745af5a6ae752a70cbd09ae2d3d17a8
+DIST linux-6.6.29.tar.sign 989 BLAKE2B
84228e96923cfc36873e3e91083665cda51e1d32267b7452eddc034866da945606a5cd3fc1f75cd8022e6ee0596f3cda4baec7d8691a61f9c4fb81847d26e2cd
SHA512
d6f28b767db05b3844242b24aa188e304cc5c38095a51c8ff23f99841a20dddd9c798b73196fca9569a8eb03b166e259ec2036e83badc95fed76010f07058b6c
+DIST linux-6.6.29.tar.xz 140175132 BLAKE2B
9f1d24bb15d4db821f744e270f6eb24db38944afaa7ebeaba000f13e9ec7d560497608ec6e8daaf234344a510bcf1282e95dfc904c2940db4b0970479ca7deff
SHA512
d5ab8b7650fd9c449bb75fcbc2cb876d03829545c3b0c88ba5f980c33ab2a7c09ea09f7826ca457a64b33910d655e6c3a5e7c99e009ed5abe1c02b83fd528740
DIST linux-6.8.7.tar.sign 987 BLAKE2B
f9f9334079778072c22bfa5b686ed8e3d1400e62b5cb62babd6d235e303746435fc013a2aef071e7344fbe6729026456503ab1440f98ad7ccb2116d7df213302
SHA512
d440e9421b4cd519b6d40703a4c4bbac6590ee45aa92a3e693b7e3fe380de8543d5d3cf1e30d365838f8035424b5392325e7d70b195342dc1cbe9b3b356307b6
DIST linux-6.8.7.tar.xz 142583888 BLAKE2B
e8626a99c6c5769a8126d5ee1c7962c3df3c7a8c689193ffa864c4a4b8e72daeeaf22c3e3bb6ba5490eca3ef64c32a4a12980360a196444a53abadd791cd1855
SHA512
2d580d354029832e0d93401c9ef016b5dc0bcd5b5b06ccadf6fa79eb033d5af0ba29e1beca8f7a2e79bbe966d29dfd39246c8b63c8df20b756e1d484cbc8cec1
DIST linux-6.8.8.tar.sign 987 BLAKE2B
915f68d9cb5ede81853e39299e9a882b5449e724d7cccc42e6686644f95a37be36555248e8e0c3a6786223fb53ecc38685a626606596ebff95f5b51a12e712c4
SHA512
d74fbe41abf6852c39e81222eeaf112c47287d7432df430c6aec22d84a0734fe39f8f8405d6cd1308cd188c574f5fdab4e9a0718d3df46613de32381e439d1d3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.29.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.29.ebuild
new file mode 100644
index 000000000000..f586e669e361
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.29.ebuild
@@ -0,0 +1,143 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+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.6.12-gentoo
+GENTOO_CONFIG_VER=g12
+
+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 ~loong ~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
+ ;;
+ loong)
+ 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
+
+ use secureboot && merge_configs+=(
"${dist_conf_path}/secureboot.config" )
+
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
