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 C9C5915801B for ; Sun, 23 Jul 2023 18:31:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B4833E0805; Sun, 23 Jul 2023 18:31:22 +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 94383E0805 for ; Sun, 23 Jul 2023 18:31:22 +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 6BC5C340C96 for ; Sun, 23 Jul 2023 18:31:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 79345BFE for ; Sun, 23 Jul 2023 18:31:19 +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: <1690137069.dce612224fc8ece964459fb80fed731518cb8458.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.40.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: dce612224fc8ece964459fb80fed731518cb8458 X-VCS-Branch: master Date: Sun, 23 Jul 2023 18:31:19 +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: 1fcd4bf9-a923-4e41-94bc-90c52930a7b7 X-Archives-Hash: 64f5d16f4d3c7a4361a1947612bb61a0 commit: dce612224fc8ece964459fb80fed731518cb8458 Author: Michał Górny gentoo org> AuthorDate: Sun Jul 23 16:22:58 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Jul 23 18:31:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dce61222 sys-kernel/gentoo-kernel: Bump to 6.1.40 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.40.ebuild | 146 +++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index c341310c1f3a..8ed09dfaa587 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -8,6 +8,8 @@ DIST genpatches-6.1-44.base.tar.xz 2683644 BLAKE2B d0264b6d6456fb2e6a67c1240cd3f DIST genpatches-6.1-44.extras.tar.xz 3812 BLAKE2B bd5605700d0b55036d186eca82031f1d38883fbb3e2e98f0b44269c914f5a2912c026bebfdfd3fdcd563b97d3167fb9908bd0e29422b02e9314392b3ad2281c5 SHA512 e274c0e50fc476bc071fc4d77623b75cdfdda51951f541f56bc4f8ab53da17e67f615c37d35c93290d20b51d3ab2eb923a8e147daec4c59d3d1c87d3e803beb0 DIST genpatches-6.1-45.base.tar.xz 2851860 BLAKE2B cd512077ba76f23b7109f30f9a981adbaafeafc3a2b69685620b0d67bf21b3d716cfd9c6328ed7c1d6cbeaef287876b7b63b112644546d2cdb63bdb85e4b082d SHA512 1c1fd3a35c6544a030856161d902895b90fb75ad315247204361cc151190828fbe99abc87979a9df24b3e8e02aae944a130cadee5fb059e2ef174b6bc9d1b037 DIST genpatches-6.1-45.extras.tar.xz 3812 BLAKE2B a3355cc91c618303f9490eb306639325e1b46a7ff9f6fc1f546ac1532d110d981ed316b9bc44abc624f70cb8e63ff512af2708b4cbc379a69df438c6792050db SHA512 e2413fc03401dd1dcaee49bdb2cf8cb7008451cf2fbc8635854da2148464ffe1bb49127d73e534c054e5e56514bf31f5ccca507f52845334133fe26846e244a9 +DIST genpatches-6.1-46.base.tar.xz 2913208 BLAKE2B e462034f1d9d9e97411f6c6558b5df19bf92edbf214549f8d1749df795160e8c1e731effacf00595681a0576c867cdcb06e139cd1de29ac913dd37ea6404fad5 SHA512 d88711190f42a524229c4d1eb4659cf74d4c0c6f970ecc7b29fe56396eb8b05f2c01808f59c9133bef9a8cbb5618cd2cccea17192248fef133a2e90689b9a844 +DIST genpatches-6.1-46.extras.tar.xz 3808 BLAKE2B 63c0ab6a14c96fdbb9a5500e6aedf31122068e8dea30269ac538e111a340d99c8e471c414ceebe29e2c392a9e726c945e289747ac89c7110a984f68ac5bc2794 SHA512 1368893d5f52c36082e5e59cb5bb878213b1745f5067930fc5a32653e69e0dcf2661604e55249023356df8d34028c15c7640af54bab8e9a060c712ab7748d3ce DIST genpatches-6.4-5.base.tar.xz 29696 BLAKE2B 0e882d51de63cce7a7edc96c29fe46c27f607abddd0a70d2977054838d51ad623ec5ff3f4eac8e18b016f6c310ba79d326967947c17cf662391638d7fd2ecbd5 SHA512 3205df0e92db622aa397953de85605e58b4e977262a8dbb9e59174c7a55ad2c784ba417069f948dcdeddda8318389be45d54a516d9b2f45cd2948938942d7e5d DIST genpatches-6.4-5.extras.tar.xz 3700 BLAKE2B 701f2bbb493087bcd8de7c7293c802bada8965901838b2eae998ec14749da6c46814611092b4120c25dc9ebef2313e36bcdc3593110d06c510e9db1dcf575f53 SHA512 0be95fcd6ce4ca750ea97c17bd897bd8083de63b8573080a2f3cd41d07c951293083afb739153a3cb29ea55e93b7d2063089119080b26f932c6a74e9425a1920 DIST genpatches-6.4-6.base.tar.xz 314708 BLAKE2B 815c36a6185cd1006596a4829462900041bb2ab5c89f28c9c26c5a10e8bf4d4907ce4f244044e7cd95c0f790112bdadeba8cd363b276aeb37ec20270e2a9162d SHA512 d0d97bae5fd34e41d2236fbc9952c90b2535b62ac9a5a5dc259cffb7f927bda16a04175be0a940670d0a0021f6fd3cf45ecfddf0e22d7a9253c13236a9b29124 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.40.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.40.ebuild new file mode 100644 index 000000000000..7e128b87c8f2 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.40.ebuild @@ -0,0 +1,146 @@ +# 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 )) +# 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 ~sparc ~x86" +IUSE="debug hardened" +REQUIRED_USE=" + arm? ( savedconfig ) + hppa? ( savedconfig ) + riscv? ( savedconfig ) + sparc? ( 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 + ;; + sparc) + 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[@]}" +}