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 0A48015800A for ; Thu, 27 Jul 2023 15:00:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAF3AE099E; Thu, 27 Jul 2023 15:00:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 8C6C6E099E for ; Thu, 27 Jul 2023 15:00:47 +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 31EF0341284 for ; Thu, 27 Jul 2023 15:00:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3ED46DE7 for ; Thu, 27 Jul 2023 15:00:43 +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: <1690470029.67a976e4f3bc9d543bf5edd86790956b6589ece1.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.10.188.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 67a976e4f3bc9d543bf5edd86790956b6589ece1 X-VCS-Branch: master Date: Thu, 27 Jul 2023 15:00:43 +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: f7c68ba8-8750-41a5-b1a1-a3a2b907d20f X-Archives-Hash: a982af7c93ce0aaeaccd0d209533bdc1 commit: 67a976e4f3bc9d543bf5edd86790956b6589ece1 Author: Michał Górny gentoo org> AuthorDate: Thu Jul 27 12:08:41 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jul 27 15:00:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a976e4 sys-kernel/gentoo-kernel: Bump to 5.10.188 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.10.188.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 159cc5308b52..27ec31356546 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -1,5 +1,7 @@ DIST genpatches-5.10-197.base.tar.xz 5562876 BLAKE2B 17ce7ef2e11371ef7c4cababf7405079b8c64ff64847baba9aac5e6db6531d129ec48ad3bea995dec23694248d8dfd1067d0ca9d77295fece36f4f6c003e4d58 SHA512 44a6d3ba9989c458570feb9334988fcbba3fd5448936379310a7649497a2bb9f86462bbb23b0e04c6cfd2474d88d20190aa0b93fb482c0a19e3320a6e7a8111d DIST genpatches-5.10-197.extras.tar.xz 3868 BLAKE2B 349894aeb8c6cde8ca01b7b12249c492a67b9d8e1329f2e93ef14fcb1e643bc6f24613ef1f1cbedd7cd67cec6c7dcbfa4b00cc66ae157b2b9503587ef025e17c SHA512 4979e464dd29590915baaade081035c523ffaae061acb4b0d5948daa450ae6e7993e0bb0acb82d414b1388fe804555cdb59d84f0eedbc466ae64e76bd5b79d28 +DIST genpatches-5.10-198.base.tar.xz 5696280 BLAKE2B 538dc0baa1ba2df2771c23e7670cdbc23f120298d5547a6da6b876c8e5d2a27a838c7f7f80b497d2d3db5fce1911e48443a8c7ec3e9012d04ecf9dac523cbfec SHA512 910043f21ae68efaaa371efa1a71eb52d12ddf50d677502322a15cdd1eeaf4ab3b55e23dc3d26b917c5cf38639837c6b15846e99395cf4a1a4a395b3b58386cd +DIST genpatches-5.10-198.extras.tar.xz 3868 BLAKE2B fb33cb11d00237cf8649e868175fe31211dd3ccba5201ebbb9606cf0ff863a2519587758ddd6464e98716a2c8c0e210dbf833e70f25631877ec4ba55760d9b29 SHA512 19d64fa354c8a8cc895052d9259a7b25561f4614dfd0a8dc8645f70d19bf677c826715042263769b8740f14fe6b9a03e7f9cd1e0f27d9fa373223d9bf39c7416 DIST genpatches-5.15-128.base.tar.xz 5056336 BLAKE2B 7b25accd5e2c987050480abac7b79cd280820ee8b3607c84a58b6bc1c30c97c209b1a392c9c92abb7494307ccd138358674e7a984cf4766c2889ec9cee069546 SHA512 be70279f9cf6bdccf0bb3436b13cabca61e6360eae2d33e576f408ef2d32ed3bbb449083b0a84c31f98328ddda68b587f689487fe8346df41e83ecdaf702063e DIST genpatches-5.15-128.extras.tar.xz 3932 BLAKE2B 64d34eee4a4ee36c8d2431d8341723eb0ec32be703fbb3927e7984e9ea365b7907f38b2f013e725221bfb7d867eb63da4e784506615e1cacf9018c58981a2ce3 SHA512 b735304d7990925485ca45f1cd0f6434a96af45269bb3e10b9b67a41f84440654f62831a5160125f8d0c1ff4587ab00294caa1fa5223e8daf86dc0393bc8a695 DIST genpatches-5.15-129.base.tar.xz 5079636 BLAKE2B 9dc533ca9995f272c9f69c277e02f028cf04a1161b6ff18082dc132861549bf9a297a99768bd779ccf0c5ccd26e2bae321e8e233986c23123b3fa549f47a4c35 SHA512 43fd5a4739883915187fa04a5c04e106233ce8e76492240585b6b7dca8f74687c8326117383f84f8d4b8fc1de602b2a9aedfa596ce5a1275777fd15ae0f7a142 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.188.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.188.ebuild new file mode 100644 index 000000000000..91e1b5a2d288 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.188.ebuild @@ -0,0 +1,134 @@ +# 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##*.} + 10 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.10.12 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 +GENTOO_CONFIG_VER=g7 + +DESCRIPTION="Linux kernel built with Gentoo patches" +HOMEPAGE=" + https://wiki.gentoo.org/wiki/Project:Distribution_Kernel + 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 +" + +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[@]}" +}