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 AA4CA158020 for ; Fri, 11 Nov 2022 11:50:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24A4FE0934; Fri, 11 Nov 2022 11:50:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 077CDE0934 for ; Fri, 11 Nov 2022 11:50:58 +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 0F469340CE7 for ; Fri, 11 Nov 2022 11:50:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5752874D for ; Fri, 11 Nov 2022 11:50:54 +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: <1668167446.1c0b89bca35a040e293e89741cbc8d664c0a0f4e.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.0.8.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1c0b89bca35a040e293e89741cbc8d664c0a0f4e X-VCS-Branch: master Date: Fri, 11 Nov 2022 11:50:54 +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: bfeabab2-0c0d-4eb1-a190-24e8b320ec5c X-Archives-Hash: af12559ab452ec71dee59a4ce64fcbe6 commit: 1c0b89bca35a040e293e89741cbc8d664c0a0f4e Author: Michał Górny gentoo org> AuthorDate: Fri Nov 11 07:04:09 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Nov 11 11:50:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c0b89bc sys-kernel/gentoo-kernel: Bump to 6.0.8 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.0.8.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 88e5b98c913b..50ccd253c50e 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -32,6 +32,8 @@ DIST genpatches-6.0-6.base.tar.xz 307564 BLAKE2B 14e3d451ae6f21219ed86f8fea2cd8c DIST genpatches-6.0-6.extras.tar.xz 3804 BLAKE2B df263043bb2e5608eba21f3e3512628029043bbab7dc43c1190e341f66d74d7adabe224a7d726aaa23c7fb9290544419b10704e6697a45c39d1932acdc75627c SHA512 243a9810ff21706c2624a796f61690235c37faaa0b748a0c3e80bf4f7e3f6ed2285201a1f6510e03f3244adcbb3c58ecd90e6f0eed09fe06f469725792554be0 DIST genpatches-6.0-7.base.tar.xz 373860 BLAKE2B c6cce4c024ed86128424d47eea766acf42c6ebee468003aa072a20254261c2dedea7833ec55af4a9b04bc31e041e9489553ebbbad4419176caeff77c1b14ed8a SHA512 d7fed4dbaa7baa89fa045242805793a0d5cae0fc32e4ee05aeec482b41776bc6acc96307aea63cffc7521695a31c6033d183b41c1bcc6e89b580b7a67439d019 DIST genpatches-6.0-7.extras.tar.xz 3808 BLAKE2B e332e2144f8831ac194ec1bce1e8b1bef7ffdd8a1ad76003153abfe0d3d5df2db739e8299f033a67d539b51f7d97645d447e023431fddd3ba06c595be3798748 SHA512 43a5ec73f5f552c557d2456df96e9996499408a9701f35d37e78b9363ffa8e319a3d877bc45702fe3fe24f9cc8c4c9af2d0a63e3b596c4a5c7715ffb8a9ce2fe +DIST genpatches-6.0-8.base.tar.xz 428744 BLAKE2B b8cc7442f3930b8f5a9b11e3722b991f049aba0c635e3e7c1ae3bf4df12470a1ba974a0459ac02c5dc5286a3ac3377704b583f241fb844e6ef34552d4bf5c2ce SHA512 cb0c4a2a100ea25f84fa5ef85a2a52ac3c42bc83b0b38b526e96d034d9433382f5b3edc958f0546dc0692874ecab252d19d58264376d60cf9338bc6ec8a6d7c4 +DIST genpatches-6.0-8.extras.tar.xz 3804 BLAKE2B 338f4ef5b88afc9a950ac47261b06010317c59c104819c9aaee6ec845c47b31982dd86a9e4e35ff3c21997931411235d8d6322190d96453c55c443d7de0cd893 SHA512 1d58df2e68935c50b25109a3e92a48d7ab703d97c536634b47ccdd958dedca458eed5c96d1c3a37f788a6576fb655e4c4446b95f3bb8ce38ef1ec008922a3e12 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 00edc4b5dc943834bc7ee977382b2960160888db00a25c5a7f73968784aa39a2b3b69f0bbda89b3ce8eb55e746006cff2839481493ac8bfca6a21de2299564f7 SHA512 44beae869bebf5445655dafe1facc47c3dbe602b34c5bf2fa984a581bfe3250fa0df908b8807c333c2e66ab9d1a2bb8026e22140f2a1f522d0dd647c96ca4d5e DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.8.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.8.ebuild new file mode 100644 index 000000000000..b2d46f8af059 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.8.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2022 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##*.} + 0 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.0.3-gentoo +GENTOO_CONFIG_VER=g3 + +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://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[@]}" +}