commit: 70bf44584f403fa4f0f216461fb48b5535d0928e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 11:48:10 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 16:03:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70bf4458
sys-kernel/vanilla-kernel: Bump to 5.15.139
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.15.139.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 52cdb1faec32..a7838f8bbbc2 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -33,6 +33,8 @@ DIST linux-5.15.137.tar.sign 993 BLAKE2B
68b30e2470b54b36edb92077085c23a5537171c
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-5.15.139.tar.sign 993 BLAKE2B
4b83b5fad9d04a71b705ca26884044e800616f723e9742ae238e6fed2f30d3c1729cb4afdbc697848bb48da13e6651a392275f521c9fb2c88c08747f861616df
SHA512
2b8d7b6a974e84c348adb00c4c15907a696f5afc143de626ed343ae8b1bac4d6b1215aba786433761430c98246d0c6cc6f5db5ca73ca135df4184376c1aaed7e
+DIST linux-5.15.139.tar.xz 126565840 BLAKE2B
9e9172130da4a32e8a7b38e7a30bde22c127961364118c39c51d3fe9c80a24e656e7c4413273e51815fa8adc4e4095f9b6b8a65185b7ac1976bbc34445da657b
SHA512
a5cc277b6079f5fb452f32a11fd98d4398d8296ea6c294ace7e5eae543892f954070a1a222d2f93942cd652398bddaa86dd905f20480708fc9a5a04c75d3e109
DIST linux-6.1.60.tar.sign 989 BLAKE2B
ac930d10be651459fe169c44b4d7a2b5f1097e907aff55e6e6c48d42aa2b5976730d21e521c8a79a0fd74cdac0be01df68527b6ec11cecbd89b79b676342f1b1
SHA512
42146c56bf8270e05c488a5829baccf403a4b088b7312478f5fcb78b0e4742a0d20867e89ff17d3479f177ddab817dee832dca4fb5eedf0d8412ae8673b782d1
DIST linux-6.1.60.tar.xz 134984880 BLAKE2B
6d6723dd839b9003ea2a46be849e36516a97497ba3743860c8081795b372c70536465c46defd6ab4f97e81127b1bf40d78270b1a3a721a7331a935d1ef8417c4
SHA512
cef40235428a09e5f7807a8be83af9a5ab90e841049a04f9f851e69e602aeab5a50f523cae5d5928d345c11b728608eba7754b173be0c023c7ee564cfaf4b20a
DIST linux-6.1.61.tar.sign 989 BLAKE2B
238d6292e5e59cc6b64bc53c499fca901000ac247f3ccb8be897830113564c095e79da405bbd63bf76cee9c878cde47076c508d5ae944ad115b21ded340bfc03
SHA512
2bc5b580cd1ce5dce00c5ab0695aebaf29adf774f798a4232c74c7313a4114ccd25a01a30dae2e5db04ecab3b55c7591d8d7cdbdef58a8d1ad6cb98146233f90
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.139.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.139.ebuild
new file mode 100644
index 000000000000..7846645de088
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.139.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[@]}"
+}
