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 F38FE15ACFC for ; Mon, 1 May 2023 16:48:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AECAFE0819; Mon, 1 May 2023 16:48:41 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7DDBEE0819 for ; Mon, 1 May 2023 16:48:41 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 517D634153B for ; Mon, 1 May 2023 16:48:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DE08A5C for ; Mon, 1 May 2023 16:48:38 +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: <1682959707.0cf268ab09e9e213c6f17cadf77424c8e0382376.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.27.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0cf268ab09e9e213c6f17cadf77424c8e0382376 X-VCS-Branch: master Date: Mon, 1 May 2023 16:48:38 +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: 5f60306c-287e-4106-b5fe-759c22e39266 X-Archives-Hash: 9cf06a21acda7cd31f3519be6eeee624 commit: 0cf268ab09e9e213c6f17cadf77424c8e0382376 Author: Michał Górny gentoo org> AuthorDate: Mon May 1 14:18:55 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon May 1 16:48:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf268ab sys-kernel/gentoo-kernel: Bump to 6.1.27 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.27.ebuild | 140 +++++++++++++++++++++ 2 files changed, 142 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 0ba8940d4e41..42ffe5916115 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -14,6 +14,8 @@ DIST genpatches-6.1-28.base.tar.xz 1412456 BLAKE2B 126c74e7558efbfb104e97e993a70 DIST genpatches-6.1-28.extras.tar.xz 3808 BLAKE2B 3bd49fb256420883a267b2513cc9e6928a107b0142c82d9abd20114f733bfcbd474eeb19a7ef833da27ba625db28806ec25a1dd945f5d94f5bd5f729e445a57d SHA512 06c84adf52e36357fd01e8e1989ba8b8cb08bef052da05d261df3e80aac6d2d10a3c39583fad6d92936e19d8c7484786a4d11f64f2dc3fb5f8e1ee90106d6367 DIST genpatches-6.1-30.base.tar.xz 1467496 BLAKE2B 7e442668319addb39f4812669463c312c9cda5095c1086732da3ba39eb9836985e53afeba31f471d6cd2774d6028e421a254721bcae10ef89d6d38f3856debde SHA512 90a3309cc2e6cad1a971c864839e6acdedb10986fbbfb89799d1327fd4c9a541f4a46aa4d5a898046d1e0a0a648547717e522ee31622ded87e48ec4057a49dc0 DIST genpatches-6.1-30.extras.tar.xz 3812 BLAKE2B 8797213e32516d6f5cd88061574201951f5803f9e26e0662eae391704521c9530c47bcf2498a469b3e8f0696a1fa1a329fa097e983476ae4aaf38af465c1593e SHA512 58f4e9d6791b3e9903703349f4cb5456fe2e4d871cdf6f7c3dcf0338982c55c82c1da80b65a768d8efd2d992386c176821f4858aedaefcfc4b293c55a7aa8a1a +DIST genpatches-6.1-31.base.tar.xz 1473456 BLAKE2B 2bee72cc97ba8a27bab8f69ab11ca7ac3aab81c9d9a00a8cdbe4ab6a50a378d6ea0de3b825ea2acc2fc3cac900b5bb2c3dd7e652a38f804237bb478020be9b5b SHA512 da57c6f5495b0768807c064f7045a19f0d6cb1d90150b6987d6ea0e21756668fb29fdd40329061acfcb923ac3d1dda2144853c33fe5f1bb5d21df05fd30bac65 +DIST genpatches-6.1-31.extras.tar.xz 3812 BLAKE2B 2d599eba0488cce5ff711080e61cc94aef9265c710c5b68ca7badb4a13147cf8f19e4660988321a0f929a3d3a9dd78adf30f905d4eeb63de4e45f41bc5063fd3 SHA512 87db9b58bb212c5182927012b95d04628dec1cb884cf52b83c566fc52262a5684dcea298260233f8a02974b30640f538754893b2c87cb34a71b5d7674b482ae2 DIST genpatches-6.2-15.base.tar.xz 763032 BLAKE2B b933b63ddc6d19f47ba58d5a5884ffc63f533f9008b22788276d0b096f3f13ab9eeadb82deb1d37de1ac77aef082f2f10f9eded0461d31ad17165712e696d175 SHA512 6f3bb8fb4dcee4539ebf58d99b4c8b42618366b684c202ff4fe60ee3e8581175ac0337290c1ac24e9e3b552145c760ed7a65f405665c437d76f4922efd810fc9 DIST genpatches-6.2-15.extras.tar.xz 3808 BLAKE2B 6134125180afd914169eb329f5d9ec8f3f9fbd3ff61a0266200defdae573a62b39ba557c2a815229344ac762786715a6193ce3cb9c3ed08d07a87d83427ab107 SHA512 857e513619ab77e79461a337c02e9fa9fbb63ee9a837eef438b1e5af3c8c856867c738b0b28f21a8035a5e1b963eb8c13507223ad6a251f5320da67aeaeb595d DIST genpatches-6.2-16.base.tar.xz 768864 BLAKE2B e852e0feb635be67bbf0da77ca6c946abb4fdad1b7b6a6e72c350b7705c4c1edeaa152f8b5ab70e4089bec80de805dc4a506ca60f74f53d3572b3ad0214bcec8 SHA512 2ea683e51835696d825977f65d93b9c25259f59499669bbddbfadc1573e6510b46e916c4e4922d5c62bd64ecda992615fbdb076f5c50648debfe2f9f05e1974f diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.27.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.27.ebuild new file mode 100644 index 000000000000..dd5577ddd24b --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.27.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##*.} + 4 )) +# 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[@]}" +}