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 E54DD15810F for ; Fri, 9 Jun 2023 18:11:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECC91E08C4; Fri, 9 Jun 2023 18:11:46 +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 CB897E08C4 for ; Fri, 9 Jun 2023 18:11:46 +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 DC07D341070 for ; Fri, 9 Jun 2023 18:11:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10BAFA92 for ; Fri, 9 Jun 2023 18:11: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: <1686334288.1dc3ac63c6b23e1f59a3556a28f6528198063a2b.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.116.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1dc3ac63c6b23e1f59a3556a28f6528198063a2b X-VCS-Branch: master Date: Fri, 9 Jun 2023 18:11: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: 9bcd5b49-4c3c-4106-a19d-152bc24e9d7b X-Archives-Hash: b7bb5d470bfb6acd6c6c1d421a7a57cc commit: 1dc3ac63c6b23e1f59a3556a28f6528198063a2b Author: Michał Górny gentoo org> AuthorDate: Fri Jun 9 14:01:33 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jun 9 18:11:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc3ac63 sys-kernel/gentoo-kernel: Bump to 5.15.116 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.15.116.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 4a3d60e68ab2..0b283bdfe00b 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -6,6 +6,8 @@ DIST genpatches-5.15-120.base.tar.xz 4681108 BLAKE2B 7e69c38991ab3b5ec949f48fff8 DIST genpatches-5.15-120.extras.tar.xz 3932 BLAKE2B fb00b97c8b61234646388bec0dd23a1310a7bdca9d04a2048a32a4e30605662c7001188bc125170aeca2ded63954a71b612908286aeab06928dec00cedc76902 SHA512 c2b6ee91b3505dae7fe78a393001cdf6ac7d0020f8123f14d961b90d1424144996e182fcb5304d5890c041e2d940a960bac0795ebc22e85459285b16f67d9b3f DIST genpatches-5.15-121.base.tar.xz 4695588 BLAKE2B 2bbc7102194c0526cdc1f2e310871756ab87e5edf35273c41a2a8c26abfa56149361a2a8af68e215e14912bf2238c7610f60f69f88916404781488352fbdd95c SHA512 822e207359ef8ce3894152de6aacf66974d8b8bcbc5329dbcbda379cb6dc81d348ad9a38022abd05131c1a4df955426da25bf37b83ac06ccead4aa1277b2eb36 DIST genpatches-5.15-121.extras.tar.xz 3932 BLAKE2B 22ef45027450ffaafa2637aab88656c56fee375fcad14403693f94894cdfab96bb2b930cec4852babcb4bac86b07bbc9e6e103de7c871b91ef3004435e1cb785 SHA512 92b785c17dd171871dbcd841810c1e7da4fd7cc5027040340dd90f6bf97153dd0e300a6bc33e61bc7354b6e6648e3bf718d161ebacc5a4ed3a3e86e885181ff5 +DIST genpatches-5.15-122.base.tar.xz 4735096 BLAKE2B 10746c787ab70dc82b688b8720144b80719ddd7f4719e9fb2215b667ca7806b2e8c5626dd66b46f20c0e6d7e05352c84eea9cad93327fdd8edceb4fe52f43416 SHA512 65437aa0e53effa3eb84e3d7b2a0497ed4f4ef85fa96e75a8c591f27a610629193094c6d03dc676c462cf41a55bda5b5277c14726d48ea6ed59e8edeb92105d9 +DIST genpatches-5.15-122.extras.tar.xz 3932 BLAKE2B 35fdaa40b4b4e297df7f8702ab017f4c49bbca2aedc652c6e5ba8fec6b1573a57d17a9c7b21f03b56b43d9bc888e3d55354ceb92e84dde0a89983dfa1c3ffc16 SHA512 176deb6aef0eb9dace274bc4ca0f29a8d657461583dc9133feb4272211f910313fbb69fed308705f00c1c6d86845f1e961ea0066b09b42cac75a3579b3d3ed14 DIST genpatches-5.4-251.base.tar.xz 5798892 BLAKE2B a519f23086a440d560e5301b77aa1a627e97d9c2545adddc6fdfe9b55b35dcbef285a6e92d4ab615b517177723875a53b6b5f1dc9c237dec3f23acb511e08be7 SHA512 c8d228cb18f2c64631ee5a40d7de58e78c7fd2c452f54101d0e6f67149d5d3df30076b461dada5bd862e4b97daf30a6d15c3f50526b46156d9ffca946b3c65d7 DIST genpatches-5.4-251.extras.tar.xz 1812 BLAKE2B 440f5d63b80e31753c46c2c2bb07bfdd257cac6847dfaed63a19c9e255da0e6ca31f5535718572afa143918bbab9d8651b0d8462f5bce619866d78acbc063682 SHA512 54d1ea7625daff0c8d50f8abfba616378d8bc4c62cdfdc03648bec9312803464d0c662bfa619c357a73247c00b22b9725896cec5aaefc66ef811e0f97ff62e91 DIST genpatches-5.4-252.base.tar.xz 5808300 BLAKE2B d5cb4fe312f469a331269eca8604d9c43feca79bc6778af670fad859de3098c31cf0408fb58d95f233564e0ab2eff7a45ad041b8fc6bb97be0f93dd911224b62 SHA512 4970b66f064f53db230877fed6434e39aebb727438465667af6eca8603b712089830789c16bae5fe0249dfed0cb4bdbf1ce695cc7a1ebb6ab64bb61b1b38a5cb diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.116.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.116.ebuild new file mode 100644 index 000000000000..f45f633a3dbc --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.116.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##*.} + 6 )) +CONFIG_VER=5.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +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 + 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[@]}" +}