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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1BCBC158094 for ; Fri, 22 Jul 2022 05:30:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C93B6E0AC1; Fri, 22 Jul 2022 05:29:59 +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 48466E0AC2 for ; Fri, 22 Jul 2022 05:29:57 +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 0E5F7341058 for ; Fri, 22 Jul 2022 05:29:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3EEC54C for ; Fri, 22 Jul 2022 05:29: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: <1658467785.3eaf47bb99e7bee8e6e59f2feca5f5a989821e96.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.56.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3eaf47bb99e7bee8e6e59f2feca5f5a989821e96 X-VCS-Branch: master Date: Fri, 22 Jul 2022 05:29: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: 5a0918c4-4558-4e3a-a914-71d9f342cd24 X-Archives-Hash: 0df3eb170d49ed3456088068e1e0e008 commit: 3eaf47bb99e7bee8e6e59f2feca5f5a989821e96 Author: Michał Górny gentoo org> AuthorDate: Fri Jul 22 02:23:31 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jul 22 05:29:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eaf47bb sys-kernel/vanilla-kernel: Bump to 5.15.56 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.15.56.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 4edcb1f60083..816b279d89f4 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -33,6 +33,8 @@ DIST linux-5.15.54.tar.sign 991 BLAKE2B f8cd7c5ae125768ae5b62903f39cb4048aa9480b DIST linux-5.15.54.tar.xz 126388816 BLAKE2B 19952126a0f7c2eb102545dddf1674b8b9abe2e57cbdc12bce8c148ba476e119fa34b9c03813a8613fc11d4822585597861f1470b1caaba6403040e58752ebf2 SHA512 9da760f36e355f952bc3864f15cfa5b1a29c584ea8a4a8c15d7c94ca86fb63a6ee50558f64e2a53364e18cc5d0e5651b8f9db47d659e4312e66d1e0acf19c142 DIST linux-5.15.55.tar.sign 991 BLAKE2B 8d290ba0b3769e7e92b4b19a068d7cab8fe9c73ae7d33fd41966473f2d9dbb02df0157f820317f0b8244b981a877d1d394f69cd9aa3227701a95a1f3bbd4a445 SHA512 872642846ec37b43634e2f9d1200d1e99595033aafc5f2dd8960e02f596d9a3634e1745a99dba2ad3d903d4ac3ad5083cfde1d0c74fcff4e28705588edb820b8 DIST linux-5.15.55.tar.xz 126359560 BLAKE2B d69cb8bd89d7e867c5f1e507bcea1ad4b6d3e5e9151e72ede4b051e2292eaa7f07df0c6479d65d9ec4be76b37604a154d3962e21b861ad2dc0e14ca1fe01f9e9 SHA512 0407603bed7b2b447af883f952bd1a1422527b4c8f262155bf495e3a375583909fc14dfbe29f5dcaae60580964e7c431f65ee4e7c6c06c1fb5198f386072dfef +DIST linux-5.15.56.tar.sign 991 BLAKE2B 4b6acc83e1e6f8a5d3fb79ad16fd2e5343e763a289071a77fcbd8bb6c68863050e44e7de4a986766e94a95746a0360611a3ff93f267bfd8c6b455c78be8b3247 SHA512 296102204b4edb1a9a7756874ad88e060774abf16879255bf2e1b85e70453f649fb265927b166cc712fc6e7433f6a2bec5efc63a0d7c0e66d4c67955e8ca6647 +DIST linux-5.15.56.tar.xz 126379964 BLAKE2B 6710a46afe184d08d108bd199d96799e215cacf19ee22999203fe751fd2179888f2b581b83ece86aab6fcb4e2190f38dd67e064ba4d57b9d45a04355bd6fe008 SHA512 9a9e52d80b85d4563fedde43e9b220c8f98524686169bb3247816ef3abbc6eaf500cf5bdbf808e01dadcfdd810f9e93eb1618421f56b5bb3cfb9190af2589728 DIST linux-5.18.10.tar.sign 991 BLAKE2B 7ce361cbbd768cfbbda3744f8528a3b4115378029682efad4f0d785c156461ce17d012bdd149edeec56979f2b801d37f2c9f09c8610ce197a12fb2fae2c16af4 SHA512 4aae4d2bf37852ccada7709304b6e1f69447df961e947cf78c4d5914f610582958da28c6de2f9a51b9cb544d0addee241bb872d3fe4d50c0512f577a48ae30b5 DIST linux-5.18.10.tar.xz 129830456 BLAKE2B 71e1d666f2238bdf4c6a10d83c234b02b46dfa67ffbf73eea904254ddd7ded9ad5d520ec4713933388956d2e538e32911f4c99e16c5e3d0c19cbff0fbe38012e SHA512 2140d9012fdc63979c6a737513da46ca59a58f4312e8a1b1cbf481088e03da4bc2eb04fe9cab7164339ef1fde8a2a8a6d5167896e45b061b04dba0ef7b1fb7bb DIST linux-5.18.11.tar.sign 991 BLAKE2B 9132a1d3cd6c72930518136df59dbb0a88831921aed6fd21a09c7353ea0dbd7da037438efe8cd12fc4eafdf70a9fcc1eabeb92f8d34e9bffde92a6a5d29d864e SHA512 9bcd4392212659bd9c03da33b9d7c81aee6c5d608ec29225b589d9c170771b8e0729c24d3eb4b649d8209dcf1c8847d12b5148d36808bf2ecdde879d251e6198 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.56.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.56.ebuild new file mode 100644 index 000000000000..0ef902726d5d --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.56.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/mgorny/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[@]}" +}