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 B8474158011 for ; Thu, 12 Jan 2023 18:48:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53AD7E0969; Thu, 12 Jan 2023 18:48:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 3C3FBE0969 for ; Thu, 12 Jan 2023 18:48:03 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5726833B864 for ; Thu, 12 Jan 2023 18:48:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 687B584D for ; Thu, 12 Jan 2023 18:47:59 +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: <1673549272.cc6996f7f84e7e85710b550394c0a73c5b92bf74.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.87.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: cc6996f7f84e7e85710b550394c0a73c5b92bf74 X-VCS-Branch: master Date: Thu, 12 Jan 2023 18:47:59 +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: 878c0162-6a41-4989-88e3-25fc030e8b69 X-Archives-Hash: 98271ed56ed27824c8a951e5511f61eb commit: cc6996f7f84e7e85710b550394c0a73c5b92bf74 Author: Michał Górny gentoo org> AuthorDate: Thu Jan 12 15:33:36 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jan 12 18:47:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc6996f7 sys-kernel/gentoo-kernel: Bump to 5.15.87 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.15.87.ebuild | 131 +++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 49e02d34d8fc..c6e1415ddb4d 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -6,6 +6,8 @@ DIST genpatches-5.15-89.base.tar.xz 3552056 BLAKE2B 2131869a216e9e99fe893e502e9d DIST genpatches-5.15-89.extras.tar.xz 3932 BLAKE2B 25a5b47eed2412b6d660572c266fd8d22be0c3e570dab6d45a7e6a0015227a1b4cd468582bebe3ebc7f47600d3ad30a5853dc2398e39ae02352a1b5df1faea36 SHA512 b4ce39a33610e5ff1c3309f787dddca702e55d81b19dbfb9300386a246e758ca9192eb98189ed01ba138d38947fa35e27dc6d3b459da059807bee93289845879 DIST genpatches-5.15-90.base.tar.xz 3757428 BLAKE2B 30e129e5362a5fd690d8273a36e102510e113415e3241f838b366c2e35dbf1b95fa30d6e34e6e36c5d938855aefcc66a039f1242ea8a69263fdbaf84c46434c4 SHA512 bca6d1252657ad611a71ed2ea128887b131f9dad83f4c0007573b2637fd79b117023d0ade5b833070a8c86ab4f698d0b3250e01b612a0b65515a164fdc9d1212 DIST genpatches-5.15-90.extras.tar.xz 3932 BLAKE2B e84edd591a94f2d21593f86aa7ed2a27980e099b388f49e899655dd687d459be87491c6441b73a5c024c43bb81f74103ef226d3bc3ae42d089749db0b06ccf45 SHA512 687240f034abd1e91d85e057bae2693129ef6fc4b6119c71df00c306ae2d1cc64ea294a76ce8017b7f2b0ac557c41b9ac70d4fb466ca2899a3c544490421df45 +DIST genpatches-5.15-91.base.tar.xz 3838856 BLAKE2B e42746d0b7342cd6e2ab1b6b907a202277365a4fe52df5eae5d3685c68efbcbce58ab1c6d00e0b89c1f581f6818ba830f35af96d40e1bbf80ac824b0be572715 SHA512 37b31c9f878dc1cc4c5446fe7810b6fb9caf556296e99975de1e37bde9e798f5f74e90cd6d825ae1f474bbd8ae31da3f07e5527d3ce6aff42761ce8425634949 +DIST genpatches-5.15-91.extras.tar.xz 3932 BLAKE2B 139a9a7876504ce63abf76db63904b3b4330ab101ec7f0c97717ee83ff861595df31a36f5fe4fbaf3b70641e6029e399235a7ec3e26feb98522c57e6b4b5d71b SHA512 9486f83b99c1f0bcd23e556229c7c0947be4fa097d688b510b6d57d94584e6fffcc9a2412c3620ceeffc2b347fad1ea1e12f58b2f0629cf93a2bde19f567ee5d DIST genpatches-5.4-233.base.tar.xz 5294692 BLAKE2B 357046687c6f2797d5d7090dad357e00675eed329ccef44223dd476551cf04e9f711f1020144cfc59796657cb5b1e6d76b607ecb164e27636869a8bc8984f567 SHA512 45f6b35dbca12e8b9e6a9f99d12c44e47a6e471e5091ab75c42346f1d8bc12dc454cbb335f1549b497842c2d9f13a5930c80b5000cb86bd3db7b03347dfebcf4 DIST genpatches-5.4-233.extras.tar.xz 1812 BLAKE2B abedf631da893391a98a98cf48d264f9eaf9f9f7811bf595c36a774c8dde21f105afaf6f4e113e04de472bd6ce0c759bd41fd95aa980b7e05499d8571f3e8a44 SHA512 16b09d0a4465123079360ef9f070e0c163f45f9784714e98fe53f7174e836fe7b2562af01e5c2dc932571bb3eafe2d9afedfd60b5c8467bd8410de651ab82473 DIST genpatches-6.0-15.base.tar.xz 709204 BLAKE2B cba74ce5f9a6d8a00991f87fe33771f615640c8c3adaee94432580f5df51cb2a488794a376c9355d568ab4b3014fe23e4c9fb000bb9ed6948b4225211df862d6 SHA512 64d5d04b8c1b3c3967fd22cfd975b7f9bbf37e7d7d4e966c7017b589837cfa02200a80880f13ac52942fd845c9835143d809817f5517c91992e30e101b15c775 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.87.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.87.ebuild new file mode 100644 index 000000000000..635cf489ceca --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.87.ebuild @@ -0,0 +1,131 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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=g5 + +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/projg2/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[@]}" +}