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 0039415806E for ; Wed, 17 May 2023 19:30:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A2BDE0855; Wed, 17 May 2023 19:30:27 +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 61664E0855 for ; Wed, 17 May 2023 19:30:27 +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 7E831340D2D for ; Wed, 17 May 2023 19:30:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF3E4A75 for ; Wed, 17 May 2023 19:30:23 +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: <1684351802.1eb0eff22030c46c475ce43c0f7a29bf15c0b6ba.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-6.1.29.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1eb0eff22030c46c475ce43c0f7a29bf15c0b6ba X-VCS-Branch: master Date: Wed, 17 May 2023 19:30:23 +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: 65198198-92fb-4a44-8d5e-c4c9df1642bd X-Archives-Hash: 0621f647f7f54379e3b03a3b68f13d77 commit: 1eb0eff22030c46c475ce43c0f7a29bf15c0b6ba Author: Michał Górny gentoo org> AuthorDate: Wed May 17 15:19:54 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed May 17 19:30:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb0eff2 sys-kernel/gentoo-kernel: Bump to 6.1.29 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.29.ebuild | 140 +++++++++++++++++++++ 2 files changed, 142 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 1ecdafeb633f..d67881e485d5 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -10,6 +10,8 @@ DIST genpatches-6.1-32.base.tar.xz 1474460 BLAKE2B 43060d16a84ca2c65ef9d7447747e DIST genpatches-6.1-32.extras.tar.xz 3808 BLAKE2B b697db5da31e471ab0af978e722c12ca2d8c5cc371f1d4c2d11c5816b34b479e6ac17f1cd9ab26826bacb065e0a254e18b767c9cfcc12fb16c40f9d73aa1e3d9 SHA512 9113f7505f8dd5a535e2550863dc8d69a6961fc4180d5a7b77206a397db570571f083e39f6be87da072b588e4a2d1b9c1e4b2a725172c9a799b3dc8e88542f66 DIST genpatches-6.1-33.base.tar.xz 1668040 BLAKE2B 60823b42a19d54af313039f75bbd4656414201e11b088c49c3d1c01405da82f9bb933ffbcaecd19a9d2b414553754733059b667f458c4d78fb0e4d46c02157b7 SHA512 2cd6755b1b01fc58a2a4f9a0b5c15c3e2ee5ac74bbf67c01ee4d543e6df30ee35f01bb23aab8e4b7fa0e36fbcb6cbf5e07bae6ab21010d12441d34ea802085fb DIST genpatches-6.1-33.extras.tar.xz 3812 BLAKE2B 4c0552c0cd447cff8e1725dbcabe9ae02be41f432805b6e5e9fd360c6a0d745b5bb5d0dd5c7b36a3e0468622dcf89d3d7fcf47f0b1b1735f76ca281764c928ed SHA512 fc1efc3695e71daf5d3445758ba0af5a8714c22b9d3788f59bba0e4383dadc91ebb14e3114aa711b270c2734f3bd8355b6b7e98c9b81580b9da8c9ffe6207cae +DIST genpatches-6.1-34.base.tar.xz 1760348 BLAKE2B 9a7672bf2f106e0df50997d746171f80059627f84104b1919098fc75e2e01b0b262ea06905a768d8359fc3df9190b874413724529fa7107265ceab61d0f19af7 SHA512 678c5591831a779f852fcea89c807d256f937e3e01ba84b3b167274a1bd5c69ab20fd31b1f759d83986520223677c0e2e31bb3dfe624339b16fc45845ee8188a +DIST genpatches-6.1-34.extras.tar.xz 3808 BLAKE2B 9830d4850e5095ef0864df0aaa25a4549678fb76b22807abf61739b42b048455535aff7eaac16bad5d2cdb0cca65efd2e176a50f40a685250df0b75565fadc36 SHA512 13c8f7f596eeaa9b78be7aae7667a196e199fbb8d3cc045318dfdfe1ab340622fd0e958be09ed8608f9667231d6523685af1f03f4f2b52d78810885c0e9fe4a0 DIST genpatches-6.2-18.base.tar.xz 995956 BLAKE2B 402258df823b898522612e18c9d0c51c38cdedc9b4934961989de768c8feb7ce0287f3354a75a97a2a0bcad13e74bbfadff8233b22ae816149f9eec85c8c6553 SHA512 1162522ff7d5a4408b1a1eb5d220822cd5e3db11c9948dcbc011dce67d3022d7af643cff81b2900e91957bebe0f00589bb7db93617e800dc3837f3f537eb1969 DIST genpatches-6.2-18.extras.tar.xz 3808 BLAKE2B 4c80c3e537e6ea6ea2a9d720127bd5a661417ec94ddb373d6301334108c9765e985723475c85dd0acadce92811b7bd1a96f68cf657a4e943f8be49bddf641eb6 SHA512 8a63c7432326af46c1d9c5e3170f3cae77a35b3c7ccf4ece155418915ee21b511e7b32e7b377976773a5e188d43eb39dc8f435de269779b5192761f21414db37 DIST genpatches-6.2-19.base.tar.xz 1082064 BLAKE2B a25100f54e9775fb220e2debd088c2d9e822e0c8e80da51f34f2372e2b2ee9a09f64fde4ab63e7b53ff1b6c5c0022d52aa7fb6d023a234ef520b3566bf4055c7 SHA512 bae1c063f9e624ebd935681ec7323b7c4fadecff63c2f4cd21d13731a70b549a4128c59a03e282c502bfd9b631ca6ec876cc782a90f633003dff97fc05c95eae diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.29.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.29.ebuild new file mode 100644 index 000000000000..d77da3bdbc2e --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.29.ebuild @@ -0,0 +1,140 @@ +# 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##*.} + 5 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.7-gentoo +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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" +IUSE="debug hardened" +REQUIRED_USE="arm? ( savedconfig ) + hppa? ( savedconfig ) + riscv? ( 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 + ;; + riscv) + return + ;; + 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[@]}" +}