From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1432523-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id BC320158095
for <garchives@archives.gentoo.org>; Wed, 31 Aug 2022 20:47:46 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8335FE07E1;
Wed, 31 Aug 2022 20:47:45 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 66D1CE07E1
for <gentoo-commits@lists.gentoo.org>; Wed, 31 Aug 2022 20:47:45 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6E17334119D
for <gentoo-commits@lists.gentoo.org>; Wed, 31 Aug 2022 20:47:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EAAE59F
for <gentoo-commits@lists.gentoo.org>; Wed, 31 Aug 2022 20:47:43 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1661978853.4df7a619b710cbfaeb78fe062e7b36921b6b54d5.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-kernel/vanilla-kernel/Manifest sys-kernel/vanilla-kernel/vanilla-kernel-5.15.64.ebuild
X-VCS-Directories: sys-kernel/vanilla-kernel/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 4df7a619b710cbfaeb78fe062e7b36921b6b54d5
X-VCS-Branch: master
Date: Wed, 31 Aug 2022 20:47:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 5a416b38-1ff1-4895-a83f-c11938033c8d
X-Archives-Hash: 2180a1298a3d5abebca9fad1b8ab83f2
commit: 4df7a619b710cbfaeb78fe062e7b36921b6b54d5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 17:40:30 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 20:47:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df7a619
sys-kernel/vanilla-kernel: Bump to 5.15.64
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.15.64.ebuild | 134 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index dc7df151bc13..85a278fa4f7e 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -26,6 +26,8 @@ DIST linux-5.10.140.tar.sign 993 BLAKE2B bf0428036aebe23af73b783d29c87ab99a068f0
DIST linux-5.10.140.tar.xz 120465880 BLAKE2B 3d0b610a3869fa46d3a3e28d839d84600924b3e4ae7560ca7d0fc6506572bab18550b16e0dfb357368bb9679b29f69efe627f12d79c8110b280cfe1d1db140a5 SHA512 90adb9ab6d3cce058840cd2b286c7336c436a409210e651cd065c5089fa36b6d22e03c48e7eb681aa79b7899e77176fbcd39927089ef5bddc1bebfbbb69d694e
DIST linux-5.15.63.tar.sign 991 BLAKE2B 855d118b3164e1ea14789647f173000eaaee7dfc27f27da497c1b6fb787b35d47269d2c233f0a79aa3560be7a1c9571b2c52a8a78fce1d73f400d9d21a17b7c3 SHA512 99f256fc013ee63c918eb521e741347c958a8ba018d5136e960686952fbb510416a80413d3dacc5a994220e6d8866a427ed8476ec172f48c03f34be4b93f33ac
DIST linux-5.15.63.tar.xz 126441480 BLAKE2B 95264d45411bb0ba30b0eadc2847075d0763bdc22aa86b250861ea18066a1b16b88627c61d0829d7b0a21e9e478df064a54b343ecb2065b37a011bc0cad986c6 SHA512 a1b33476484b9ca7a105d07b70835ad7e7e670750e6beb428ce23fe1bd853d66cd8a1ffca9ee736a98a42b98191d290127e628d33118be971c661e2fc6faf8ca
+DIST linux-5.15.64.tar.sign 991 BLAKE2B 0f6101a3f7d34da6f5bccc3178741089442625a7bc240468b4469510d5a769292928bb6f4d5c9141c81defaf097bedb67e8c110b0a966832b71f20a318e46eac SHA512 84c37bcb8a53f8d1f0e8fc3061efb7ab8e2ef476374bc2fc92985c51876bf5895a18fc67d9e35c32065ef35eca3d4bd120705c647e4f4c41e666a24c602dba30
+DIST linux-5.15.64.tar.xz 126437284 BLAKE2B 05ffdbc86b13f9a892ac8d4969dad06f6da27981627a9591b6e0bc44b9460cc00aacbc573407ceff438448e02e2d14edd3eb920a0ded958bb6864bc4b7c988ed SHA512 3445baa4f53ab8108af576ca06596071cb12be7d67d93899c0819fa2feae4fff551e702a91357f798f920a0f7fd6cd38f2c1cb66cf60b6cc10142e503fe21b85
DIST linux-5.18.19.tar.sign 991 BLAKE2B e4bff93a2fb9c06613f0aefb27e159e9ae0526c22112dc46aa614f831af9d3ffa1db72131d721133393893285934a2e6b2cddbeeec585e8d6571ff1975172cd0 SHA512 bc2e414ee13d75ba80136730ce49125ceee9bf6ac82a81586dd39d3805adc03e24dd433da7cca60380ad0dc594d60729ffc0b754aa542659845e74a7aa67e0bc
DIST linux-5.18.19.tar.xz 129890668 BLAKE2B c02d07137bb30b429ea3c822efa1a995271cc7c07d7ea8df460e9024f66ba372d1e1fc30d80fe7f7dbab77f0c9a3821aeb2b777d2b0de161c94b46a18fb25184 SHA512 a80445c6195a9cb7922b47e0874ad1f495ecb76a28edb4b7026cb2790154d60042521a182785a2ccb83200c9ee37f38c97bd4566dcf74aa9f961c75dcc1dfa65
DIST linux-5.19.4.tar.sign 989 BLAKE2B ba3eaa69dc251491815722f35100e17ac5920d02e15bac9a5cc7151a36b3f0d6a0fd42c17854940496e3479c2c0a8d66f799b51ec81b6a517bf5a639fa9913bf SHA512 35b17075b3d620666f199ec72b3b4389e5d5f31380b80aa58036840ab9e9ecc403ccd5169f2a75642563900c97bc253b483f74ab4891236131fa78169f33c47d
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.64.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.64.ebuild
new file mode 100644
index 000000000000..13b58c5c9839
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.64.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/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=${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[@]}"
+}