commit: 8457687574046d5a4fc22f23327b68ad1d2ab72c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 17:16:23 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 02:54:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84576875
sys-kernel/vanilla-kernel: Bump to 6.1.48
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.48.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 5c22e7409c14..95197b06fa1a 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -34,6 +34,8 @@ DIST linux-6.1.46.tar.sign 989 BLAKE2B
95f91ecbbad15ec67a2723799419e295485cf1fbf
DIST linux-6.1.46.tar.xz 134962288 BLAKE2B
07a069c04919899ce2b0859d0a528ee13b154ec8c9e868a2a0e64f6bdcc0ce30ea4fd002f1b58e62eebfaf8216e528e26b79c7a99c67f208e4d36eca590836bf
SHA512
677d524974f76aeaaddab158e13df7c820e92f6e3c74683f5cd3dc9923859982079cd1da3fb41d3e87f96d72fb0abbc92d662122898e0a79adc7c8eebf005bd5
DIST linux-6.1.47.tar.sign 989 BLAKE2B
5783f29b3e5803559e818c17c22c8a3766e3e00dea494b2184c3199d6c068de4151f9a0684035d7c43ae9d7d21a762095cd726fc49f653f1c7b298874c72a31f
SHA512
7f3a831b0274c54b719cc0ec94cd3e0499406fb6f5fe3caa07d9aa9e42feaf416f8bbaf908d1e7d308c7eee2a9a37e05742b41405ac6822726a08e23e3f4db7c
DIST linux-6.1.47.tar.xz 134962984 BLAKE2B
318276ea54366300aa4893cc861c35fe267ff101de23e700a0a4566d3f0db0e332faacace4747453e546089e33bc9bc3103f8f320e54154b725dc3a401032047
SHA512
2c559ae816532815d5aaafdf3f9e7a6a36e03252ef87d0fd5f6c6391eea618338bcddde7bfe6839d741db0121b93c733baa1d3b7547cefbe8ffb7cb76f72f1a2
+DIST linux-6.1.48.tar.sign 989 BLAKE2B
f6aafdf12eeb8e1e781e839b29530acef36220bb8705515ebd07a5dca573b0cbcf65a4489ebba51fdbccd8073c58559cb9b8268f045f9202d4f4330f6c94b08b
SHA512
59adb56ea5e87305cfd06bc3b9b3a059721e9514403337e3ad401ada9404d774f50ceb37be66a8eff4ea69ea3ce26baded659ffa07f0de4c7fce62299ace7b0b
+DIST linux-6.1.48.tar.xz 134962064 BLAKE2B
b0f4abe3dec9c95ef4a51df92a0f2101d7114485798df58ecf3f4310190417fc8ec38f48aa3e022ea276b6267fe1cfb7ccfc4b999128adbcf47332769063e2e0
SHA512
edc8d9017bed9fbf3817fe5a907cd31e58ea76b9d9570016023181ec91f0183ff2eae2ba4887c44756b016b43181ec3e1d658777c95540de694db0525ea9b9a1
DIST linux-6.4.11.tar.sign 989 BLAKE2B
b8b55a05aa9d5249365a17faf7c0654d6172988ba2894d6bf21c33a8c175dd220cce190415f84235175eec729a05a85b25f2ce9f240e59f81172823ed3a60eb9
SHA512
c4d218992809cfd6ed6afc324cddae579bd2d1cec66f40d04c1d182ca4dbfa8487539cb63b2ec432528b28f30b9e156fc0ce243878ac8c6607cb1e83c01b5888
DIST linux-6.4.11.tar.xz 137836952 BLAKE2B
dfb97f2c9905a150c0890b9c3d464bc13986bec7bcd038c333f4dce443e0a1988a9075554219f9f419ef71af98827c05fad4a62aba1e58aa7f2ef8249f140175
SHA512
b3abf1d7c6b03644ddfc0a1994c88abd9b6db71089aeb4ff8749e9eed5d3772bc3468eabdeec99d998ec091898e5c81a84ef839345ba368580509500a3cc73dd
DIST linux-6.4.12.tar.sign 989 BLAKE2B
598b2dd8b0beb25db5b0500547bfcf7ea669c06ff4afaf6252f996d0bb519f5d19da96a1b618ae7a03c4e27a56a5a1540d2c1b66bef9683d14aa964e0d768d39
SHA512
d1941097b97dee631cec1487ecdb9a3a4c145ec8cfdac325776e9e890bfff2f559140d178fe5ec27b0482f04df2713cb2d6da59e20a7bdbce8ed50c148f3b585
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.48.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.48.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.48.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=g7
+
+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[@]}"
+}
