commit: a3671d003f41a0fa31c211cd259780982943a14c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 6 17:55:34 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 6 19:44:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3671d00
sys-kernel/vanilla-kernel: Bump to 6.1.23
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.23.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index e597df719275..3493211d3fca 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -80,6 +80,8 @@ DIST linux-6.1.21.tar.sign 989 BLAKE2B
74d19ef204080151bae956d3a15ace81b8186e328
DIST linux-6.1.21.tar.xz 134821424 BLAKE2B
4755964f4751902e8b08034752ecb4463642b971b97d2478e03226d4c26ad56353329b457587228abe05059bc88c156a5544050999bfb052b3029e57bcf82ad6
SHA512
6b49332fb3553f67adda4184e81ce8ae1acc9da0615bca82252372fed1326776540e9a853e74cc869f433406ca9c4744a4a3efa980dc2ffe1120343c40b045c5
DIST linux-6.1.22.tar.sign 989 BLAKE2B
348a8ded434193e27a884c5ba88611cb128a1d2a10e1ef4a40c81a130a4a59a8327f81bd525923b94592c4652b2e74b4d016e11bc59b3502ee947f0694ec69c5
SHA512
ac6d56375a528095ca3654fea572cca198e728a3df616f67a3cc0db8f440aae59b093e524c3392dd9d396d8b95c2a56011bf54e23ef669f922fd4a61f0635374
DIST linux-6.1.22.tar.xz 134844516 BLAKE2B
c9c286505f1d20ac76b8992d8e27c42d196be5e495d168049c5460f1992fbcffda470b66b47b1919dbd50e081f14251bca79d664db2cb607fea3f64f2e2b404a
SHA512
9db5360c85a2e8c7d1a3a37e0d79dafe3561566e098394a15e8cb48929a7afa74b203d3d67c286a8ddb4359a0ba8d45f33678219f9ccb8f728d1c4d4455fd27f
+DIST linux-6.1.23.tar.sign 989 BLAKE2B
419f3bd6e476139813cb84fd8bca9ba57347940a6cc82d4442e1d634786e7edba4bbf56d66d35859279d183616daddc95876a1aba6ff266c2f40b6f29265c9d4
SHA512
0a954024d2ec979ee3ee6951793fea3f3a80f5d8edce3cede38ef28b96ea0c2f8a896c99d896c9d3bc35e43aca881985ceff02c681697bc3c1cc2a1494064146
+DIST linux-6.1.23.tar.xz 134868752 BLAKE2B
49e806ad62fda82dba900c008fe84bb977ddfb9a40ec46a8dafb0f7ebe77f767143a0d029747e24b088f75ac83bb3177ed33dfe10ed2e29b980e4287ea9b3351
SHA512
6b57cff7222e3c193f5b54f8381b18ee3f15544a8c8cd8c5c5eb5504044e2ade93744c0324bd275beecbcc1dc4ec650aed4a563ca575aae764b14c785584f661
DIST linux-6.2.10.tar.sign 989 BLAKE2B
5e87f3049989c378759f28be42622fc880d211b68990bf0892f81137363d40abefc32ca2a3cbf27cc8b1ada5ede67e7c29f4a1c6f77af59a60f637454fc62c1e
SHA512
98bd960221afb83db7ad59fc693a2cbcc1394db0affb0a459af2fddfcc6ee441eceac9d322f60abe91258d45f88c6cb55fc884803167f8c706e826f0b9f7db72
DIST linux-6.2.10.tar.xz 136456416 BLAKE2B
3005c2644600e700892a6f20ed1e9f65b56b8891cabcf1acfe1432fb55aac86787f40fa7e197cf2519b8a8f5d737ed5638c7e1ab850b4694554a87be14b8a5cb
SHA512
56e55c4339f381fa4b99f50c647fb0c2339b366126f56ec91aa6a41b64b0d2f4cac2f18a0fd7a9b984616c1009e285ed9e128129d45d134c7c01918f11a846b7
DIST linux-6.2.6.tar.sign 987 BLAKE2B
dc30795c15693b3ebdf05418aa418e4545d95731963035dbcc837367227e882a314a72a1e5110482df2b53d3ac54626384f4f7d26b41951b69f4413d76e01c73
SHA512
dd6ba22c6ad1a6ccb64b4b7cd77ef1ce8c6c5550026bdbda636f58e88ed91dc36aa7cf1c362ec1a42bb46d82369e5dd66a7aad1e663c20577b68d69962592887
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.23.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.23.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.23.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[@]}"
+}
