commit: bb964b46ca19b1afe34feca744846f6f0dc2d82b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 14:31:28 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 19:12:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb964b46
sys-kernel/vanilla-kernel: Bump to 5.18.5
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.18.5.ebuild | 134 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 4c45879bd368..fda8a54cb335 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -65,6 +65,8 @@ DIST linux-5.17.9.tar.sign 989 BLAKE2B
a078037dddf7634cf5e854b79a873cb743a3809a4
DIST linux-5.17.9.tar.xz 128449736 BLAKE2B
83dc3cf66933f42a3cdce0015716017ed7fd7810a380a9374bac495b9f0a96b1b95b05bd012332c4156189f6a02d8a9b8b33c9391458adb9909a75bf661d8547
SHA512
8866b6f0ab8cbc122bbed0083ee9b351193780143259b818a15cdde1581222ee728a60344ea9267d7f3e6b1563b24a23100f46e6bd185fdc1e169b804e48cc2e
DIST linux-5.18.4.tar.sign 989 BLAKE2B
2742a67e16a88e6b6c0068e35176de11caefdea09bf2ba837594cbc1eb1b52ac4000861533e301f2f4f3afad468a7157f90360e0b0a88e4dc9693bac54dcd0e4
SHA512
3dcb8b9c8075b15ebe46198ababdd9ca2e95402a41eaf3d871f06fac2c68b1f717f6e40eaa7a1b4ba1a46aa4805148b43460b6551054d5ac611e0914d4dd5baf
DIST linux-5.18.4.tar.xz 129853184 BLAKE2B
64ac558505062485a2f9ae9d67983885707814eb93a6df2468365b1f07536e7b06bbe916078162c9a2f9754620c3efcfeec4f308ef2dc520a3f8f76d7d0b8f23
SHA512
a8067e47195ce5ae6c8818989302ba9c01768190f1908541b4fa9230e23eb33a76f99ad6dbc36484595522179b2b5116bffe9a31b8731bca5d07b02ac546ac42
+DIST linux-5.18.5.tar.sign 989 BLAKE2B
558168c1828b1d3960e8e4f5e0f5c72b2b3ad556db722db234dcfd7da71a6f01226a951b3426292ba08104b6aaaa468f4f43199e6400928c801850bf492bf8ff
SHA512
3018e8046fc9ce248952fff1c4c2df821306f68e639ec5ad6b9728f72974e3c589166da823fd9e0a751a5681567c6e84beee3a20735608bcf54566be30a3ae4d
+DIST linux-5.18.5.tar.xz 129825940 BLAKE2B
d2670e53d72fc5f0cf637394452a701c7ab41473be526d29deba7b60789dc56e1c369f3ae05a76f67890822588a36d0b497f267b4b75c33d0a98ad5131c697c9
SHA512
1872e2cf8cdd6e0033ce69f26f25526a30c237d220c02b20829fca31d6068fb816de2f2e5fd41f6807648cef8f28ddda392b199c7b1c3b48b2460c840fa1e150
DIST linux-5.4.195.tar.sign 991 BLAKE2B
c80a3a547d82b7d394155f396e3beb66df61272dd5f57be00fcf3b8b6bcc419914fde3488b950f29f6c235210e8f777e28199a4126530963749ed3107c49a249
SHA512
a770e02e59031a8bc74c832c1f9947d0f2edd397de23eef234f18b7070128c8adb1836ca4297dce1afa9f5ddbdb97fa4404e2c90faa81d5502d8856dca4112fb
DIST linux-5.4.195.tar.xz 112920616 BLAKE2B
9c3b21e2bf18800c4b55bb04810e29fadc6414fd100d4c2bdd3df1ba7db72124a0bab389b9d5038fd04440ac69a06383df5b4c42d6e2a6382c81af8aba366bca
SHA512
695e46ea1ac6c587f39f724460c480f4994267969cd620a776766ee7a5bb88b346154baa3ecc3444dfa1d0d39a5e8a0f1a5e36cdd76a2c71ea7a899b8a8a9d7b
DIST linux-5.4.196.tar.sign 991 BLAKE2B
8da70a3f1f7a4bd7e9a312146bf891c160625126c9672a7c3a213c8dcdcad2b8ce9250b8bdfad7ab412e6913f6a1d85832818a987a3de040a38e2eba70079c3f
SHA512
96f28a7a44022e9a116ce15a164039088bb64b416d89cfae52ff33e0b05cd9c9b7edde1bd66b9a3838dcf4e937a73a02cea8af1c157109fa426bc55a6b4ad1d5
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.5.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.5.ebuild
new file mode 100644
index 000000000000..2bc8aa91f184
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.5.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.4-gentoo
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="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/mgorny/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/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
+ )
+ arm64? (
+
https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
+ )
+ ppc64? (
+
https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+ )
+ x86? (
+
https://raw.githubusercontent.com/mgorny/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[@]}"
+}
