commit: fca47304f3b07b9e4e66e6a30bf3d8fa9bdf593d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 8 19:03:46 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 8 21:26:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca47304
sys-kernel/vanilla-kernel: Bump to 5.15.138
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.15.138.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 204b4696aeb1..4638988575bb 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -36,6 +36,8 @@ DIST linux-5.15.136.tar.sign 993 BLAKE2B
d72d98b6557ac356e9eb2c994e86c25ad0e56fc
DIST linux-5.15.136.tar.xz 126553260 BLAKE2B
ff3c5009b2e3dbb37c972cb28fbf1734864d488b54a715eab517b0842795015228daf9887a9114f1dd1e65957b99061086bc83a75bee19dc686b140e212223e4
SHA512
07d8023a69cf145f2b0ab3ce782b8e469508cee08d615517fe8874f3e782f9979ba7b0aa5149d812a0d0f96a2fd114f4c5b0a2a6c51a2001ee6f40804f2d9bd8
DIST linux-5.15.137.tar.sign 993 BLAKE2B
68b30e2470b54b36edb92077085c23a5537171c3f1b593dabd648c2e41e57cf0a8929fdcc4ab03fdb070ae4a53752cdaffd83f3657ea1881fcdd2e06e46f913e
SHA512
12dad9fa1a1c6fb9248539c099cdf18e672145bdc2383f9c2aea11c5cb02cceccf974ceff8aa552f49081a86180c6617de5359b53862cfe2cf798fd5cb5968f9
DIST linux-5.15.137.tar.xz 126558376 BLAKE2B
b10bdd4d9696ee523240d392e8f2386e184d92596e4aac0a784c2e215f92e42294ed9062ee1cede76ea58cca0dd3b50de34a314982f637a0d105f7205891fe33
SHA512
373567253a8e144369bec9349dfb22fff5749666b6a0be741bfc6f50f11869c944343fc5c75a99acc5ad94343750e78b332658e3f0f68e3027e310a375678f12
+DIST linux-5.15.138.tar.sign 993 BLAKE2B
578688b615fc67ec50da6c3ea3975851e55480acfaab92b8fa9edc6361b507d0f7a098f530f8b4bf0a6b04fb88962bd6e48ef6e4b563aba14ae54dc6433f2eec
SHA512
c6217aa663b3b1ffadfb2972cf114a77a46d9a90294a7bbe87a521bdcaf8ad3d8eaf03bb53ea1f8d72e6181fcf2c2a329b15a7e762f0545d6026aab5c3c3c640
+DIST linux-5.15.138.tar.xz 126539568 BLAKE2B
c6483d6728324661a8f7b5cf5a684e2fcac66bef6116ef687b0d0cd6a0df31daa74278fa1091b0aa72f2fcbe731b62cdf7795edf5367e3d9a2398140f49f6960
SHA512
575f2e16d71df034aada0378c7bc6d71e9bd23d45d9e58d57cbc935f61500fdfb087f5ebdcfe963ad082edb4d89b3e130d070a911cfcf44c9f788bc29e0a395b
DIST linux-6.1.57.tar.sign 989 BLAKE2B
90c9f151c97c1794632cbb60a94ecf4071ea566bebe0dfd676455f7f90145bd96711bc8679f1bcd86f859c775e22c00ed36e5bc95acb9bdae8e6ab98b65d749a
SHA512
c49065affd1fec362a677b7aa17fa428ca9ed4008951525d14c47764fdf759151643d416321237856fc120898d382c0bb7db6d715103c2308c416eaeb2f17426
DIST linux-6.1.57.tar.xz 134983816 BLAKE2B
9fd3b4ffdc392d2bedf1b9366fdd773e006c7148756420ae621285874bb2ec9461199871579ba713ce5df1831ace7392969a97f2d5b90b08695f632b97655f9d
SHA512
4ab0c0d2b2c6879c044fe18a1fe8472207f27bb596f7cc12d530aab7910fcbd5d672aa8cedfcecb7794d6a4dfff9d60746f19958703af472e5ecbd3287b67f08
DIST linux-6.1.58.tar.sign 989 BLAKE2B
122d097f99a6697f767aa4023bcf3b46cac6d139654d3259741aa55c6b13533e7db932cc069866d544199d1afed89e536c1700f761d5649e6c615071df66de92
SHA512
67c926518b5549d9446559568e860299d15abd9f656b3ab49329c4cd6ee281f17a0676b9b97b95edb42cc86949b042e99808864ad83448f130a84187e9537a29
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.138.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.138.ebuild
new file mode 100644
index 000000000000..7846645de088
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.138.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
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g10
+
+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://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=/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[@]}"
+}
