commit: 72251c7721a501b1bc0700c79a932d57d0177b6c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 11 01:02:50 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 11 07:48:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72251c77
sys-kernel/vanilla-kernel: Bump to 6.1.57
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.57.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 968f04806900..51fdf5686ef5 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -37,6 +37,8 @@ DIST linux-6.1.55.tar.sign 989 BLAKE2B
d10c453aea7debd92cc2ff13c70d19dfcea716468
DIST linux-6.1.55.tar.xz 134978840 BLAKE2B
60e806a9bc02c69e60e5ff5fcabf26622054cc48f372c60ad62f5a4e1c67c50632c017037b9d96657d124e9651eb80a367ef8fb85256eb68faad0dfd249bf1da
SHA512
047d98b1aed8201d5d0d29228e6cbc0984cfb7b77e6f5584ad94431c644db8ce099445d63e7f5b6b6fd9b031176bf9448c3c99863273c9e178170af7cbe0d20f
DIST linux-6.1.56.tar.sign 989 BLAKE2B
181cca6f641b68b43d8c3e3f903fe0129a314b458d84f9b710cc5c07e15c29f2086ac053d006d6f2896613e13f8d4a1d59e32bfd8ced945316506b5fa32c4543
SHA512
6b0642511aa8e7d8f795e20d8f209a479e1260ee2fc20eeecbe9de1b923a852124b1b82a170d24c1eeb9142d5c6ce12946999ded4f6b55ebea0ec8bc0b1537b6
DIST linux-6.1.56.tar.xz 134989580 BLAKE2B
c70da3ecb8f849890fe2b5bf2874a2dd4f468508b508aaf1e7e6773c63845e782e2cf5285e0e7e62ce25e7a4485e1cf033122c4d6fbff0e83b92e172423e7a5c
SHA512
4f03c0991f6d2985411885b6026b76ce0bdaccb94edf3a0352f8be31cc5056bee9729089af2be4e946b1405d922afc5d6fbda6b1117eef35fd4a0cac6dcb51ec
+DIST linux-6.1.57.tar.sign 989 BLAKE2B
90c9f151c97c1794632cbb60a94ecf4071ea566bebe0dfd676455f7f90145bd96711bc8679f1bcd86f859c775e22c00ed36e5bc95acb9bdae8e6ab98b65d749a
SHA512
c49065affd1fec362a677b7aa17fa428ca9ed4008951525d14c47764fdf759151643d416321237856fc120898d382c0bb7db6d715103c2308c416eaeb2f17426
+DIST linux-6.1.57.tar.xz 134983816 BLAKE2B
9fd3b4ffdc392d2bedf1b9366fdd773e006c7148756420ae621285874bb2ec9461199871579ba713ce5df1831ace7392969a97f2d5b90b08695f632b97655f9d
SHA512
4ab0c0d2b2c6879c044fe18a1fe8472207f27bb596f7cc12d530aab7910fcbd5d672aa8cedfcecb7794d6a4dfff9d60746f19958703af472e5ecbd3287b67f08
DIST linux-6.5.5.tar.sign 987 BLAKE2B
24619bb3d949c875a242f3908e9353c82ac936c4f76db320736a215514c52212127aad781393de84f15715da5f7bf5210e2c22343867215fe9774e3fe5cacf8e
SHA512
da6406e7ed54cc17ee36c14ea9b09ffd54753625861006fb4ec68cf1b81cc7dd8fbc42890ce98424082dbb4fac2f90aa353bd0b27fe446219e6940d90d03c9c3
DIST linux-6.5.5.tar.xz 138991456 BLAKE2B
2152bdcd8799b89612e76c1b3794313f981e08eda23c0150e56297a07f326c85f2a7a08106eb4e4d502b2134ed69e4344263fe6a2b398af5b5d7ccd018c0899b
SHA512
c95ad978847915e044146f254c9cec7d3d32e4afc28a5cbbeec2f0591aef28f584f0a273f7bb5bd8706cd7cc849dfd0cdb764fbc2c84e8b3c1b0f30fb6bfd306
DIST linux-6.5.6.tar.sign 987 BLAKE2B
cf964c7017391eb169141935048572f684e183c4f19c8fa436d3c116b13adf75f5d8d0999df2ff907872de0067fa42267d2ec6f2ca59b386b8e77d85fec2c0ef
SHA512
39370699c241d7e5be58fd6b331e8095752046a79362d22b2ae0501dcd3f2a3cc20c47be0d4cd58c56c0bb15eb34400ffed2e5937185e4aebc77caec6f4e3ef3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.57.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.57.ebuild
new file mode 100644
index 000000000000..aaebef705bd8
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.57.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 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.7-gentoo
+GENTOO_CONFIG_VER=g9
+
+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=${BROOT}/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
+ ;;
+ 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[@]}"
+}
