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 1BC6F15800A for ; Wed, 19 Jul 2023 20:13:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D95A3E076B; Wed, 19 Jul 2023 20:13:40 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BDA3FE076B for ; Wed, 19 Jul 2023 20:13:40 +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 B15B3340CA7 for ; Wed, 19 Jul 2023 20:13:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8BA1BD6 for ; Wed, 19 Jul 2023 20:13:37 +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: <1689797612.8ac08ba1d3050bb8a65284f487a1d5a42bb103ad.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.39.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8ac08ba1d3050bb8a65284f487a1d5a42bb103ad X-VCS-Branch: master Date: Wed, 19 Jul 2023 20:13:37 +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: e0420e8a-ddc5-46ec-ae5d-da1099c17505 X-Archives-Hash: 85767de1ad5a2728c6f9788760d7b4e2 commit: 8ac08ba1d3050bb8a65284f487a1d5a42bb103ad Author: Michał Górny gentoo org> AuthorDate: Wed Jul 19 18:35:41 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Jul 19 20:13:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ac08ba1 sys-kernel/gentoo-kernel: Bump to 6.1.39 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.39.ebuild | 140 +++++++++++++++++++++ 2 files changed, 142 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 7a02d7db3cfd..cd0d39d2f1b8 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -6,6 +6,8 @@ DIST genpatches-5.4-256.base.tar.xz 5956736 BLAKE2B f1f5f42e5383da96ac4dbbe9cf7d DIST genpatches-5.4-256.extras.tar.xz 1812 BLAKE2B 3942c845d2159bb2fc927c5f19a3d5fc0cd7abee0a1102e07a4bb657a213527575fac692ec408f12f679e3a1e791087237baaa6199e92d8062bcc4576fd142c1 SHA512 6242d77b0a7de7542395a5461e6aa8b2a2003f77ab81b1931511f36b42b914bad839ff2683154371118bbd81953de0604d23d75f662437686da694dbb610c8e3 DIST genpatches-6.1-44.base.tar.xz 2683644 BLAKE2B d0264b6d6456fb2e6a67c1240cd3fbb95eef61701bf953df6e25e37a12fb12702b57f66e30ac757f28d9d1bcd0f2fbc38775d5b73922504084ff95f9fda1d78f SHA512 e3777a612facad029782fe63abc702af06197521fcf90f4c80311fd7ad94739209573c7de910dfaeafd88948c2c3f3d29bb27f4fa1069475295b6f5b29e14116 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.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.39.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.39.ebuild new file mode 100644 index 000000000000..c338d2cfc68f --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.39.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##*.} + 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 ~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[@]}" +}