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 32CDC158091 for ; Thu, 9 Jun 2022 18:27:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23A33E086C; Thu, 9 Jun 2022 18:27:51 +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 0B894E086C for ; Thu, 9 Jun 2022 18:27:51 +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 27EDA341495 for ; Thu, 9 Jun 2022 18:27:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F8B94FB for ; Thu, 9 Jun 2022 18:27:48 +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: <1654799259.3e4dc65014d03f107cf15122f317728e85143b69.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/gentoo-kernel/Manifest sys-kernel/gentoo-kernel/gentoo-kernel-5.15.46.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3e4dc65014d03f107cf15122f317728e85143b69 X-VCS-Branch: master Date: Thu, 9 Jun 2022 18:27:48 +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: 881ad14b-4f08-4666-8297-34893899a3d0 X-Archives-Hash: c95d836f779217af587cd8bf1a975cfb commit: 3e4dc65014d03f107cf15122f317728e85143b69 Author: Michał Górny gentoo org> AuthorDate: Thu Jun 9 14:59:01 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jun 9 18:27:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e4dc650 sys-kernel/gentoo-kernel: Bump to 5.15.46 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.15.46.ebuild | 131 +++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 6a96683e419e..b419864ea9c7 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -16,6 +16,8 @@ DIST genpatches-5.15-48.base.tar.xz 1909116 BLAKE2B f3b0a3234a30ca102daceee91368 DIST genpatches-5.15-48.extras.tar.xz 3936 BLAKE2B 9b4063e107540bc974fab302dd638f468c461780f35bf23e885037bea7fa8a521db5071a40560b9739b042609376f9d703c38bc943bd85987c95d2b0a87636a6 SHA512 f32559fc7935bc4d8059f7a806d5b3153f3f3248b6b8f60a4b746eef04028d0aa7526eab6e41ae25e2f07a8388fd5a1f89648e9ed83c123d2f259911efefbb09 DIST genpatches-5.15-49.base.tar.xz 1924264 BLAKE2B 413b52e2d56b8da573f23def0f2f6424072cdc1019c06a208986ad7e876a7cdcb9bd2ecac3ffc53ed07ae36756c4cde13713c07058bd67953d40a7b968935805 SHA512 874200e89cdcc359476809b36d118a97839d79df4067e423a9b302d1830f54e381c70d93576ca14c3f2c57b5c3ac256d38321c5c48334e6ad4de527c4821b00e DIST genpatches-5.15-49.extras.tar.xz 3932 BLAKE2B f38c4df269bdaca692d05f2b478b3133d5c55810d2e2d8689850bfc50c9eb108943446ebaf44b87889f8619006f6f8789da09137963aef6e08a95784dae65b25 SHA512 9b00de23b1112f192a10284f5dd6f1846d42e3e0df74aa63d58d4523cfd66eea227854aa7088b0389fe70ffb4e945ee7f6e1d845fb299faf0bbd394902bd5473 +DIST genpatches-5.15-50.base.tar.xz 2105492 BLAKE2B 518b28b1244d4a84a02f0a51637989cd20e23e33eb1114da1a7102e8ff63c225e2cc8a425b0f34dea6caf1c14094427c479f5a6bca4f5c52440ee0dfe2745db8 SHA512 4fc7266870ca65f000e7a431757e78b7d2c2c4e9c1e2b39ed5492b7655190c6aba624be30dbcb88bf22c2e19b8a3f0849a4f4c388a406954241a47619c1cd0e9 +DIST genpatches-5.15-50.extras.tar.xz 3932 BLAKE2B 969f23628d80be3179e13aa7b09f19d104e13f656446e00bc4f25f3723184f104b18d835a28cfb16fed9fe1d9be68a274c14e294669beec631257f9c77d4557a SHA512 2ea8a7d58a0989198eb0df196757dfd8141cde484a6c652226fe09b030e12856793d2ec5f139096354c808840e572eaa3a236bf0952c47739ab9c13ba508286d DIST genpatches-5.17-13.base.tar.xz 713196 BLAKE2B ecba47430d0aeaae2d09d586a9ea016b0b602e2005ae7bf04ffaea7967a7542660dd4bed6cbd5268f187416896c046fdcb7e1aeeccbf293012d11c7473c4d6aa SHA512 fad3e0c53a5bf450dd9dec4146233e322553e110c8b3bd93c53cdb664859aeeb3e5c861f5e04cfbd550014288b7dda9b5740e5d970c443c140c8bfe0559ab82c DIST genpatches-5.17-13.extras.tar.xz 3932 BLAKE2B 9aa42ee7af3c16e41f6bfffa91855a8f1949d795fd435f0334d89de5240238cdf5fd14b964236973d3178172db2aff98989bc3626f9ca6d9f9878711fc6bc581 SHA512 1cea0fe9035f02f8099768608bcc1d896234058af984db268bd03cd27e3f12c2ad108b3f6d90be11b7edd53983d19d7ae3a00de87f62c3e80f1eace1cb5660d7 DIST genpatches-5.17-15.base.tar.xz 769140 BLAKE2B dface984138a5b7f75911c7d6a4b7fcc67349f8adfcf863aa960fdddfb0e426fb0e408cd2f725db8df17cc9d742a68f85e24c91c644b3f0c7ff142fc105fcf24 SHA512 8fed293b503b150507ecdca6d19011083cc1e3e5caa9ec4bc8527e282892c2dd35d24b746403d2b6a746586b526ee07c2fb50e97024ac409d03aefc50c372aad diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.46.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.46.ebuild new file mode 100644 index 000000000000..3e9875ab5936 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.46.ebuild @@ -0,0 +1,131 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build toolchain-funcs + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 )) +CONFIG_VER=5.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +GENTOO_CONFIG_VER=g1 + +DESCRIPTION="Linux kernel built with Gentoo patches" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz + https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + 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 )" + +RDEPEND=" + !sys-kernel/gentoo-kernel-bin:${SLOT} +" +BDEPEND=" + debug? ( dev-util/pahole ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +QA_FLAGS_IGNORED=" + usr/src/linux-.*/scripts/gcc-plugins/.*.so + usr/src/linux-.*/vmlinux + usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg +" + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + 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="-gentoo-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[@]}" +}