commit: 19e2d554d64578ed9da392f36b75e3399cb450e0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 3 15:56:19 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 18:10:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19e2d554
sys-kernel/vanilla-kernel: Bump to 6.1.103
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.103.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 180190c1db61..7edd1fa482b0 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -52,6 +52,8 @@ DIST linux-6.1.100.tar.sign 991 BLAKE2B
35f2d1dbe55d66536bdab3d20f15a5b2783e972c
DIST linux-6.1.100.tar.xz 135166716 BLAKE2B
c7201bd15c48d611c0eea2cb3bab528bd0fdd3e725ce1ccbcf0ecc9525f28b1a587ca9c083d6ea7e13b6df6894883764eeec5324dfd62f60bab9d7891e17e177
SHA512
842c5ee1109f6414b0173b83abf9ae0655a8bf1bf36299d86d83db1dd2a70147f7f637afe202c3899984fe340ce4633e4e5d3cb9d7b0b89014226a413bc79d8d
DIST linux-6.1.102.tar.sign 991 BLAKE2B
e5e40dd707a9ecd9642c81abdea16e0e15c069dd35a3ddbef77524653cc61cb21d4f3d114cdb2b6943a3de5610adad92b09b1465afead2ac134e35e84c503de7
SHA512
dce1539ffc89493358532974778e78bebd6351d7bcfb7a43a392dd2ccfa170bd8d14b51327abb99e1d6dfc055349a44c10febcac1187e52455946a920170fd58
DIST linux-6.1.102.tar.xz 135151884 BLAKE2B
aa33c053b3d868a626ec472d4e8062b49490f13e5c57996153641308e8a4a672e2c3fc42e187ffe89436cd2af6fcda9bfe1b513e2484a2a33319f8ee38d19452
SHA512
10b8a0a69750b5d9f7fa8a735707ef552da6224830847b1edd7e2641db16857684ae19c4d18a6bfb5fa45ce985d420c35fb8866ce80eaa5b86e77a9629440ef9
+DIST linux-6.1.103.tar.sign 991 BLAKE2B
0afb5ad0fab7340ede83ffcf97ac683a2b3c35942bbbbb1b3f5955b934556a42ced663dc22a4882780c8aaa988652a82cdbbe3d0b75b58446c2e3870339c4b26
SHA512
c0381f7dfe44c635a1a72e1b3ebf7e820d8d08ad76984deae70adcfec773b2781381a1dda92564ca59217ad75d15489026784f75897188bf42f1ee214606ec0d
+DIST linux-6.1.103.tar.xz 135175280 BLAKE2B
64a4ebe7fe9f3490cdcf7801e708b04d1996a94fcd26f257c06eb156f0077723882bb2e43aa5f63b1cb3497d9beb0334e4ea7c7f73cae81a6b7c1a92da0ae504
SHA512
a6199b000e44be97f51f4c83dee93659caabd6d2e4cb3f20d4f5fb9a46119236a4df2fa6dbe3246bbb8994eac967384cf315d9db8dc7f05309e36c33636984c0
DIST linux-6.1.95.tar.sign 989 BLAKE2B
abd402b54ac2dca9b1e6d7df1fd4db8690d584c13d214d4234182da12eeaa71903201aa7bd34538de3f498230ac7b71ff4626132c30629f8905256c7423c5804
SHA512
2ae944acb2482ce1bce854478e0800eeeb7970a1bd8ddf47e872f8334e818c1607a98f11f401928e07ea1f105cc5508460c1caf2b62a68ed0266d4085755b888
DIST linux-6.1.95.tar.xz 135134536 BLAKE2B
3334f93a646017d22cac7374033acda5fd0df41de9d415d172a2c31f770d28ec16a388bc61d0577b53db4642bb31db472efd5ecee354a4b36e64a9c2df706604
SHA512
b6997281f9909483ed16a1b3998da6ad9f64c1c524db558663f17ed38987f42d8b1431de8c6ba354e30f7da2f8237b675fd4fa341d8218fcfaf2a5b9ac84b2d8
DIST linux-6.1.97.tar.sign 989 BLAKE2B
5314822c4096f8d3dfd37a680bd8c278b60cc086d7c2567912d81c6a27ff73c1cb7db42f7eec1049996a855593333b0dc7be882dd5713d2a30cad9da8c70b81e
SHA512
5f37bf0f27faf0fa13219109b202f139b875155f6f4e938625aa8b67b6a7ddcbbbb3364638192739e78d08c621a47afa5eec7e0f67193eaae8b337611774d633
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.103.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.103.ebuild
new file mode 100644
index 000000000000..7dcd0d3528a5
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.103.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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=g13
+
+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
-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[@]}"
+}
