commit: 3ffa63abc0b5701f9f2d6fc6af0bc5ee6c93c04c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 14:46:56 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 19:19:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ffa63ab
sys-kernel/vanilla-kernel: Bump to 6.1.16
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.16.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 05b1a5e9785b..520120a2414f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -56,6 +56,8 @@ DIST linux-6.1.14.tar.sign 989 BLAKE2B
f42ab20b9e6f0c2bf0168af954d3a6a935b81964f
DIST linux-6.1.14.tar.xz 134814408 BLAKE2B
9ad53bc025283b6ba1d426d7f24deff809c041ace336ce696266c81c832370da3590d99d8669c54aed509ae3fbdc8ffe97a8b4f2ab5fcc3dcaf44f0d32d33827
SHA512
55f57edf9cbb1076f887f061898639b6a977c1a5f80e0bee1d4d2aed22a7831609eb13cab3f5653802f1a97333976e409db18d0757b98979e3df632b576f991e
DIST linux-6.1.15.tar.sign 989 BLAKE2B
b7232f040bc4be3d24223aff245306571b8e63243e11acb99ea95644d490598bccc02e6abe84be7007f074178b9c10fbcc87f2238f25b07ae7e091b502fe18e4
SHA512
a3212cc8b1fae98508caf16b783e6408d0abeb7b903157285fc65f49297d5f68cd0555376cee85fc50afa5ffe03330cf86055280fa948903a047f7416448182a
DIST linux-6.1.15.tar.xz 134854068 BLAKE2B
3481d756a4daee96f732388a93d7423a784ddd573a0ee973e2e6d44ddc0ba5bb6ab84279c117c3ef6b2b086ccb6128bcd025286180848e89411d03e2e9797bc7
SHA512
0f98aee21ba902254881317148a78dcc3bc2dc3b6a8651bc0c35e8d63850ed1a9ac4271d5f74ed0ec110c219c80674d26abf9ffdd2631278cf1c7c85d6cc209e
+DIST linux-6.1.16.tar.sign 989 BLAKE2B
7b6cd99f171b948c15031cecc78eb88c6c9b39301c43b7fd00b5b4a8df7d2a4753cc7748b2841f69bb37386a48ac9eaafada4ee2e811f3a41813559c6219a888
SHA512
28b52272c2c0560bc4680a86664e1376e6c2e1e96d97f27355d86ff64d2a759624f88cd33bda769bcb2774ceab7d59f618c0ea008d6889341a6804bf9b6f48d2
+DIST linux-6.1.16.tar.xz 134833708 BLAKE2B
6e61a45093f8a91668495cb0c0e9e9350a80581f772c3e1c42536bf66ab9e6952697b695faa3a53cb326644296dda0e70d671477536364e7b3d98476efaaea13
SHA512
ceb37f0e7e8b29648a0880f0d375224f8dfb19e612f9e5966a8a6d07755cced62b5a69ba88ae79f12b4e7a482e746fea4ebe9f2323e9b4967f0195f72f205642
DIST linux-6.2.1.tar.sign 987 BLAKE2B
37c7a969bbdf12b86b72c245e632e0990154e4ae57ab35da8c3efa5e092d42ba758a88739b5628775635eb0f9e8e7b007111bf63426adc0ee0ade2d1a2f984bf
SHA512
70c4ee9c0a39127e0893fa639e65488d11f8f9f342de76259f28ab709842860165a200d8ba986de627628f4689bd10b1e0c95a17db9e2c909e4d4ad2aa99297c
DIST linux-6.2.1.tar.xz 136445896 BLAKE2B
72c221e68c6bfb19b49c15c491c2ec35db045c730487e409186819620b65b605046a03df8e0c173141d1893ecf7408576b266fe1b33baa72cd44aa26458da562
SHA512
79d3465955dd557dc599fa1c18c7a68699f4febdd7264fe4e223c694e879ef5bb65fff9fad1ec5599f894ad6519bad292efbd5b9990dac3223d843f5c22c65f2
DIST linux-6.2.2.tar.sign 987 BLAKE2B
ee5dae47aab443841f6073b2da066ec7cb625059ed1f300c623a1d38df995055ca84a0ae4d4215826de467a3355bccc3ab9a26bc228aec4f7f0a4b2d9cc92171
SHA512
42b166f3e5a5a3d6507a1bf7c7a8801cc8f3d7f663e3580847014cb404b7043cbe395f29528a482d70514ebc55db69105303b369ca12dfd7add2fd3125ecd6e1
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.16.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.16.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.16.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[@]}"
+}
