From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1365899-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 B200E15808B
for <garchives@archives.gentoo.org>; Tue, 8 Feb 2022 23:21:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BCFB2E08F4;
Tue, 8 Feb 2022 23:21:47 +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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9280DE08F4
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Feb 2022 23:21:47 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1AB64342AD3
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Feb 2022 23:21:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4FB572D0
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Feb 2022 23:21:44 +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: <1644362489.3dcf0ff25dcedcbf30ff6d33c0acba29b0f27084.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.22.ebuild
X-VCS-Directories: sys-kernel/vanilla-kernel/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 3dcf0ff25dcedcbf30ff6d33c0acba29b0f27084
X-VCS-Branch: master
Date: Tue, 8 Feb 2022 23:21:44 +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: 6eaf25c2-387f-4990-9231-e8f0acd5d19d
X-Archives-Hash: 67b36d92212f5eac6af5c5fc54383176
commit: 3dcf0ff25dcedcbf30ff6d33c0acba29b0f27084
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 8 19:22:02 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 8 23:21:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dcf0ff2
sys-kernel/vanilla-kernel: Bump to 5.15.22
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.15.22.ebuild | 130 +++++++++++++++++++++
2 files changed, 132 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index f5fa57b35c68..fe2071b7461e 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -28,6 +28,8 @@ DIST linux-5.15.20.tar.sign 991 BLAKE2B 0d0f2a8a97a991af1623a1e3e49fec2974b9b584
DIST linux-5.15.20.tar.xz 126200868 BLAKE2B aa1fce6c09c4db0be4540bc15d2bc799e62047621ffb9f40ff709fdbab6c4ae983bb0a47e1a7720fd395b28d5d467febfedea050ff243f39b08399f86571d02f SHA512 49890763271ead7e9bd3501a320f3dfae2e0af2e07e74fced08757e9de72c1a8f374f58c9c92517b4fa523b8a81c7a5de5bb529a11c4e0ecb3122128ae3bd627
DIST linux-5.15.21.tar.sign 991 BLAKE2B 2d2bbd5b687f97c2b5ccdd05cd4aca339f532a32238ecb72744395f257c0fd9758b4265ccbf347ff291598cf4844074ebed2f23d29f25ab5b2f3f45141ed7747 SHA512 374826a06f73cc913b2621a099a58130242b74ff173dcdabaaaa320ff767a17cfc43abb19a4e607723c7473df4489af1071ec903f5fcd7fd8974e808dc0e48c3
DIST linux-5.15.21.tar.xz 126222040 BLAKE2B 9180dd81099429e55a037986481ae9c3bbce450070cfef083946771347de829ad4fc63fd83512bac3bd33ea4d0eb765a7d4afae7111467dc425cda3bbb9c5303 SHA512 8a1d126f6ea7a8cded502b3dd8bdb54b0d26f3ca7a38b8134cb05118306323d530ba8a738a7fef03f72708c875a79989e6de7089530c93c2a9caf4b662568813
+DIST linux-5.15.22.tar.sign 991 BLAKE2B e961955e26ddd07104d467ed419e696f16503eaa0199a4fe55f452ea35aab9a645d9bff8dc54a5e25f6de41663b5c05caf08a1a372a740cb4a719ba078773349 SHA512 0ee9194a22958b79ab31895fc5f1d198c525cb50118476fdaef7b83725be3de91cb946a04b4e29bb5c0e4d1684b205b99f0efa105a1f1d92292581f48ed4aaf7
+DIST linux-5.15.22.tar.xz 126216740 BLAKE2B 86896b1d0e2c5c489fbf2bd2c070fd58492c8ddf0841f7939bd8db94215616ac1236fd3ffefb9791134c90f7391f1d12a394725a488f4241b147f90d7ac4b40b SHA512 c2740770cf27e8b8be660c23700ba68e783da4ee4ac0b7ea4f0aeefd292a53c83904554f376f5b43648423372c3bca1ecac2bf992260f9cfc6a1bb6673fcd9bc
DIST linux-5.16.5.tar.sign 989 BLAKE2B a55d8da745785fb479519fd9daf745bae4be54e2b8c135b9f51af38035b273de86bc54dbb7598f98d3bebad995889a779bd88f9d65b2ade44d9bc995ba5ab2a6 SHA512 414f71b299c7624604d1e4b5cc894c888cefded016249d2cefda54727e043152a6abf1a62daccd4934348965c4a574ecad6b098d38774b114098a6d74d9f6921
DIST linux-5.16.5.tar.xz 127552076 BLAKE2B 9eccc20c59a93aa21349ce99b88638de8bb0589037e91143d23932cb5312878bac7ae95adfd0f95b79ad0085f74109577427675320e4a2548f8762661dcdc8e4 SHA512 bb87573623a275a8860728e9586f0e63aba7bd868de55ce27871f615e9b174aeb18c3faefc41e3d656bc998768fa3e3c6097e9d39c32fea48d3769f46c48a2f2
DIST linux-5.16.6.tar.sign 989 BLAKE2B 49eab210f7029b8a24cbaec467cd5b1ead4b22a00d3132fcc619aa9c0ed126cbf3f763f8af49447a4a258d990a5a707880e2b5705b4310c066aaf41a54086384 SHA512 b1f241b097bb7678b06b361f35060c1d0846d5a3001b98238b7a81c3fa965b9eb8af13144bd6f4914fc47b16f2810ddc7b25c60605aeb99fa03a705f5c024b2e
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.22.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.22.ebuild
new file mode 100644
index 000000000000..3b10562055bd
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.22.ebuild
@@ -0,0 +1,130 @@
+# 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.14
+CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f
+GENTOO_CONFIG_VER=5.15.5
+
+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/v${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 ~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[@]}"
+}