commit: 2d5a9667111e1487fb379ef3dc2b9d5f35d64624
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 21:04:17 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 02:22:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d5a9667
sys-kernel/vanilla-kernel: Bump to 5.15.58
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.15.58.ebuild | 134 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index ad814eaf512f..a9cb794686ca 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -39,6 +39,8 @@ DIST linux-5.15.56.tar.sign 991 BLAKE2B
4b6acc83e1e6f8a5d3fb79ad16fd2e5343e763a2
DIST linux-5.15.56.tar.xz 126379964 BLAKE2B
6710a46afe184d08d108bd199d96799e215cacf19ee22999203fe751fd2179888f2b581b83ece86aab6fcb4e2190f38dd67e064ba4d57b9d45a04355bd6fe008
SHA512
9a9e52d80b85d4563fedde43e9b220c8f98524686169bb3247816ef3abbc6eaf500cf5bdbf808e01dadcfdd810f9e93eb1618421f56b5bb3cfb9190af2589728
DIST linux-5.15.57.tar.sign 991 BLAKE2B
8585f184cdad7fe37a5bb9d38734f99cd9c836408dfc2d0fcb3209981a22c4663e0c0cee2583b9278b38ab4f31567db9d97e544969438d0ef20eff91239fc8db
SHA512
37032bc31f811b4f68a6dbc6bff4e48242cf984886336ffe1864a9d2a1439f77cd258214a86e68918ee0f8556635c051b0d4ed0c69e851985a62833012549a57
DIST linux-5.15.57.tar.xz 126380740 BLAKE2B
9adea6b8ee97ead38ecab39b1ef08b2ee1647eebbb2a8ccd2ba253eeebfd6435c83a03e83e186809473a982a373185874c0082aa0c56f5928d304c7df56dfb86
SHA512
d14968b0fc7f4c3162c2c7975367e5c685675e29515a82d3010bc49a124e761beb90eabb7f0e2823e2afb32c0110df887440966dbf37c29247479d5009905d5b
+DIST linux-5.15.58.tar.sign 991 BLAKE2B
da7c889a8485c2f445eec54808aec0e43f9e36cc66b4c566cc4313a1333c0094c2e53da0d93fd49b4105eb3285f159a51d50f2c4edd10efd1efcd54328cb5318
SHA512
34262df54828ea963e2dfaee89ee29b1514de0857be360019281805ae8eac211778707aeb247bd7816f55b0691b6820efb2a87aed4294adf4c263d6f965da934
+DIST linux-5.15.58.tar.xz 126389084 BLAKE2B
0bf2596c9f7c7f112389d47de169c3399305f48241f36fe479d18b80d874d8ab90faf44b5bd6384f4dec2998c22a0ef365a84bbe917a1dcd55875a91399b101b
SHA512
b0474dc0c8e7e1bfc45e22f5df3c435066ad69144fc4b451335e43133c2113f3d3c1f7c2f3df6e54539fb6d87ebb16f069907c1f4e5922bb69a07e2a00463110
DIST linux-5.18.10.tar.sign 991 BLAKE2B
7ce361cbbd768cfbbda3744f8528a3b4115378029682efad4f0d785c156461ce17d012bdd149edeec56979f2b801d37f2c9f09c8610ce197a12fb2fae2c16af4
SHA512
4aae4d2bf37852ccada7709304b6e1f69447df961e947cf78c4d5914f610582958da28c6de2f9a51b9cb544d0addee241bb872d3fe4d50c0512f577a48ae30b5
DIST linux-5.18.10.tar.xz 129830456 BLAKE2B
71e1d666f2238bdf4c6a10d83c234b02b46dfa67ffbf73eea904254ddd7ded9ad5d520ec4713933388956d2e538e32911f4c99e16c5e3d0c19cbff0fbe38012e
SHA512
2140d9012fdc63979c6a737513da46ca59a58f4312e8a1b1cbf481088e03da4bc2eb04fe9cab7164339ef1fde8a2a8a6d5167896e45b061b04dba0ef7b1fb7bb
DIST linux-5.18.11.tar.sign 991 BLAKE2B
9132a1d3cd6c72930518136df59dbb0a88831921aed6fd21a09c7353ea0dbd7da037438efe8cd12fc4eafdf70a9fcc1eabeb92f8d34e9bffde92a6a5d29d864e
SHA512
9bcd4392212659bd9c03da33b9d7c81aee6c5d608ec29225b589d9c170771b8e0729c24d3eb4b649d8209dcf1c8847d12b5148d36808bf2ecdde879d251e6198
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.58.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.58.ebuild
new file mode 100644
index 000000000000..0ef902726d5d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.58.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
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
+ )
+ arm64? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
+ )
+ ppc64? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+ )
+ x86? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/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[@]}"
+}
