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 47A6A15808B for ; Wed, 23 Feb 2022 17:04:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C636E0964; Wed, 23 Feb 2022 17:04:13 +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 D4AB3E0964 for ; Wed, 23 Feb 2022 17:04:12 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3AF1342D86 for ; Wed, 23 Feb 2022 17:04:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1186B2F0 for ; Wed, 23 Feb 2022 17:04:10 +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: <1645635828.3135bc2db64f0a7852297bbc8e6b4dab32a96c8a.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.25.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3135bc2db64f0a7852297bbc8e6b4dab32a96c8a X-VCS-Branch: master Date: Wed, 23 Feb 2022 17:04:10 +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: 02bbf231-4938-44c5-8d76-e4bfcd60f69d X-Archives-Hash: 79fa507c7075817b6c2eeb96bdd04417 commit: 3135bc2db64f0a7852297bbc8e6b4dab32a96c8a Author: Michał Górny gentoo org> AuthorDate: Wed Feb 23 13:45:09 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Feb 23 17:03:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3135bc2d sys-kernel/vanilla-kernel: Bump to 5.15.25 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.15.25.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index ee3f1013d7af..bed0c2621ca8 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -24,6 +24,8 @@ DIST linux-5.15.23.tar.sign 991 BLAKE2B d085b784adc51f74b17156a43c22fa98221c80ef DIST linux-5.15.23.tar.xz 126202324 BLAKE2B 36be53585e67350496a84438712d35e488b745e85b6981f51448d9b19fe30cce9968ef486defd8a68f556e2518d010bf6f63dbf2bf7a504e25568e71c3aecacc SHA512 eb863fe0b62b7f2457bb66361fcb23a7a629a53dea3b23b26d012227d318cd09fd99b94763e88b593ead70eda1f58b702354155a043aed0ef1e68d5d1ba53ce1 DIST linux-5.15.24.tar.sign 991 BLAKE2B 1807f81e43cdec5b5852eb5c9df6f17554466d4ed946740e1fe7ff17ca46c9c5ca07236127563bc2f249d2b4516e83c08e600b680c415c1cd76d4074f9c55547 SHA512 3ad52f00c39a9852b3f370c5b74eee375c7d64307a0f93f73542f407b8f6e72da7f9de483c6bf8fdc96dc52c8c053fb8c152cdff88db6fc5621a3905708e046d DIST linux-5.15.24.tar.xz 126247188 BLAKE2B ae4e9738d78f4baeac1222b78b26fad45f04fa4db749b9ff594c3c86c462437941c8376bf91c8dae1db8008d4608ceb23ad1220a07c5b2074e0973c8ea77ede5 SHA512 b02862b341e10e06ce2ba29e4a28fc7173ef28ab9b75866aa7be8cd35f2666f6b2200e77c9ad22f103bead493eaae7286b429a55f0f5b68d794c06e58a69dcfa +DIST linux-5.15.25.tar.sign 991 BLAKE2B dbb9ed0688150a6532f7485dd567b7ca8c865c54ea6f4949e71e7dc16110a6a21ead9a78e5606ebcedcd6eb80957c5213a91a88055f5751b83ca9e2c20641a30 SHA512 25b461a3d4f7cb8ec37a7217874db743a376c5cdd00a47772f5b3d7669fc9833b1dc110625b576a007fe7d763d5540fc4d4ec097d0a7d3d460f25e8212b03090 +DIST linux-5.15.25.tar.xz 126242764 BLAKE2B 6bc93aebb0031f3ea1b5b84fabf4e643108800f495dc6900ea5dbcf0172583e5c50364f20cdbbf579205051eae37437c4ddfe9d1b8e3fbae1779fd4f6ba326f9 SHA512 a44994f41ce19d386899564e898536f51dbfe534a7d791743f4f09f3560dc8710caee6cbc566ad678420e14591f17517e138f09eb6323303bda0c8ea41135d07 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.11.tar.sign 991 BLAKE2B a08fef5aefd7762197c3c7c809c53d84fd7560dba6b023609f9b3510e16ae450fb170c99c3737f6accc21f56db1f915a1c6511bfa424abc29dfbd999e6074baa SHA512 19044cc74d5bb6961fe96d272af9413a873332c0a7467bbc86673f9cc0f26f512520af649d95d5aa986f1194f61d0e68a54df92e929d1642382fd1f4e49bcbd2 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.25.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.25.ebuild new file mode 100644 index 000000000000..eb965e06b347 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.25.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.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[@]}" +}