From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 B355015808C for ; Wed, 16 Feb 2022 18:07:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD8ABE0855; Wed, 16 Feb 2022 18:07:54 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 8A8F9E085A for ; Wed, 16 Feb 2022 18:07:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 869A7342C20 for ; Wed, 16 Feb 2022 18:07:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BB5D291 for ; Wed, 16 Feb 2022 18:07:52 +0000 (UTC) From: "Michał Górny" 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" Message-ID: <1645034857.809831d5bbe0a09ef0fefed918be40a2bbe7e870.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.16.10.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 809831d5bbe0a09ef0fefed918be40a2bbe7e870 X-VCS-Branch: master Date: Wed, 16 Feb 2022 18:07:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c5be0ae9-934a-4f9a-a353-7c4246d16a0f X-Archives-Hash: aa0faff134e7e2286b5647ec34adfc7d commit: 809831d5bbe0a09ef0fefed918be40a2bbe7e870 Author: Michał Górny gentoo org> AuthorDate: Wed Feb 16 14:19:15 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Feb 16 18:07:37 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809831d5 sys-kernel/vanilla-kernel: Bump to 5.16.10 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.16.10.ebuild | 130 +++++++++++++++++++++ 2 files changed, 132 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 6d014f7eb454..cc38a8756943 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -20,6 +20,8 @@ DIST linux-5.10.100.tar.sign 993 BLAKE2B 5f1de1e82b12d25802965038847a5aec97b2dfa DIST linux-5.10.100.tar.xz 120379824 BLAKE2B 670a674351eb35ce33be67c05e2d91de3f9f3346d3cba5c419286e279a647cb901aed4506f5a50c28b36df0ba14f66f896dbebc2c99d459a3b8a6a5944899386 SHA512 c20da85f73f46dfe6f65c6faa1739816a514cda6b5caa78b9ee21030489a94cd40fefe09ba2017eec9b195ecafde3aa1146a353204adc7575413a0f67abf91cb DIST linux-5.15.23.tar.sign 991 BLAKE2B d085b784adc51f74b17156a43c22fa98221c80ef057ec132aa462ddba79bc193f1dd645a1a21e752ed0d5e52949b2aa77f0b1b7d4341313bfe3206013c8934fd SHA512 880aca81e1f4bad49850b904c8f78cc63e8e1eafee27a912e655ed609b2c552e7a1076fffb557d8f19f0af850f917b2ee43a9181f4559dbe67a41161776b002e DIST linux-5.15.23.tar.xz 126202324 BLAKE2B 36be53585e67350496a84438712d35e488b745e85b6981f51448d9b19fe30cce9968ef486defd8a68f556e2518d010bf6f63dbf2bf7a504e25568e71c3aecacc SHA512 eb863fe0b62b7f2457bb66361fcb23a7a629a53dea3b23b26d012227d318cd09fd99b94763e88b593ead70eda1f58b702354155a043aed0ef1e68d5d1ba53ce1 +DIST linux-5.16.10.tar.sign 991 BLAKE2B 3e0ec61aca3515abadac15ea954279c1d96bfc3307efd2a8f0122f5affb5da83842bfd2d2ef2d303ece944ab454777aefafe916335f1383bc00a14712ece2eab SHA512 5b95c891dfa3d7c48c5940d2ca4d773c573e8f06301ef9be591c3221a9e34cf5c70c1220174dc80a6ffb761964769726d7f550bedb6f3f9eba94a43fd776243a +DIST linux-5.16.10.tar.xz 127563168 BLAKE2B 6394d715c765e27aafa3ef7ba34fb17522eb14c5e004b8ab54eb31b55bcb782205d516cdef5f7204739890642289cd1f2ef8ac430a7ee63698ccf3b3d7b0b118 SHA512 2d1527623f96181c4797a8f73cb769e70321e673835113fbddd1374ca891d41b924220b8fdbaa46e2af7fc49a175e56524291b1816f4f6680128155c110f703e DIST linux-5.16.9.tar.sign 989 BLAKE2B 7e81a5ca6c68e347316bb96d75576d6034c849019da15bf9a64d44a01898d4f5306fb792c94bd290906e4dd20918fed78bdb74e8b56eb69e998cee1f51d39f67 SHA512 4db28620856d7f25f42f4c527eb1b15b28d265ddeb443d7b7c13efd5173dd038365cd6a336a4acbbc1570106e540b5ded7c4a17ced6d39f088121751e9dcae7a DIST linux-5.16.9.tar.xz 127566148 BLAKE2B ce4544512021eebfb8d7c87e176ae1e4ba741021c60484369af5280c51c64df48553ab2d7b53de2c3e358ea9bfbb8545a1dc7ef694628668bfcab329c59fb0fc SHA512 9f6f1c3b665b277c0432e86fb99fda2579685f680b245793f58d75d962f588a5142ff79325efa3ac233e946f076245cf8bb9f94f35f7a99932dc7f51e7f69d4e DIST linux-5.4.179.tar.sign 991 BLAKE2B 3774c967791c06ba872128010ec391480011941ff995723f6c9afb1707ffa30c530ec746061a75d392287b70e6fd45c11206749f6a3b655ce5281e7c8ba3ea20 SHA512 891681d1fe6ffd8dada62d5ec3d4e5de1f901952126deafaa0e2c754b903a8865f13cf580b99d50055f1af15476ddf2fa87a394b676b988fd302070d4b273cae diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.10.ebuild new file mode 100644 index 000000000000..04638599b94c --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.10.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.16.8 +CONFIG_HASH=f38101bdd0124e3ae7c3116b66f7fd1cd76e5601 +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[@]}" +}