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 F2C4115ACFB for ; Thu, 20 Apr 2023 19:12:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F34CBE0903; Thu, 20 Apr 2023 19:12:30 +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 C05B9E0903 for ; Thu, 20 Apr 2023 19:12:30 +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 0B160340F8B for ; Thu, 20 Apr 2023 19:12:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A49E0A4D for ; Thu, 20 Apr 2023 19:12:27 +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: <1682017931.2fe8ea36d3a56c14bac5d6f95684759c577edaef.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.25.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2fe8ea36d3a56c14bac5d6f95684759c577edaef X-VCS-Branch: master Date: Thu, 20 Apr 2023 19:12:27 +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: 8e9653d8-46f2-426e-b8ac-30213e6750a4 X-Archives-Hash: f3d96a12f61df9ebd00a620a5173ed74 commit: 2fe8ea36d3a56c14bac5d6f95684759c577edaef Author: Michał Górny gentoo org> AuthorDate: Thu Apr 20 13:41:30 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Apr 20 19:12:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe8ea36 sys-kernel/gentoo-kernel: Bump to 6.1.25 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-6.1.25.ebuild | 140 +++++++++++++++++++++ 2 files changed, 142 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 8ee611cca93b..1b9a2abbe092 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -18,6 +18,8 @@ DIST genpatches-6.1-27.base.tar.xz 1321772 BLAKE2B 8d46e2a7c0023fdca7f30edf56f15 DIST genpatches-6.1-27.extras.tar.xz 3812 BLAKE2B bd1f13817906296ceeb943a211abfab4dfec495734ca97031ac901c0b8a644e558d161d843e2e09810f2d39643adaf687ad2c7b5fad78167b7bbcedceeda0e94 SHA512 4d6d2bb3a722a1c82b324ab4924a1c2a6b6ea6afecff19f1ebaeb93c542efeb176130f938d7a613c4e11ef809ccd3abe0b4df8c358ce297b5662b36c3a06dc25 DIST genpatches-6.1-28.base.tar.xz 1412456 BLAKE2B 126c74e7558efbfb104e97e993a70b628fe7882d756ef0ef29031b042651a8df3e2e940d31f85556453cd391358421594f9e089ed194e14b107932a8d525ddf2 SHA512 b033d8b873b0c8ebdd89b25dd25a814746b1debc0f0944da8fdc2ec9ed1da3d8d45816547119f7548ac30a91003c3c078a193875711d7839e4de71234192ac6d DIST genpatches-6.1-28.extras.tar.xz 3808 BLAKE2B 3bd49fb256420883a267b2513cc9e6928a107b0142c82d9abd20114f733bfcbd474eeb19a7ef833da27ba625db28806ec25a1dd945f5d94f5bd5f729e445a57d SHA512 06c84adf52e36357fd01e8e1989ba8b8cb08bef052da05d261df3e80aac6d2d10a3c39583fad6d92936e19d8c7484786a4d11f64f2dc3fb5f8e1ee90106d6367 +DIST genpatches-6.1-29.base.tar.xz 1445804 BLAKE2B fb801efa1f48c9ff3362db22c218faf203dbc4171ee77f4539022c8f86ccbee65bb93c36e9796411dc997531dcb0b6c3cd2420a1b19ab5219fe92bf15ea3926a SHA512 c1797b202639b831fc601b6690fac85b91c1dd5dbb1520b243a5a2ed9bacc0b25f6614289b08cc5338ac8a66f8832a68a07b24ef327281c2e3c27e532a430d41 +DIST genpatches-6.1-29.extras.tar.xz 3812 BLAKE2B d77b52859028d028d6f33f7bdb26589ced57caf84c6ad5c0716f6fa978ff6a1c16518bc4ab06e76281ac486d7a5476878e408288b3ab4c55f8daa0a46a907c31 SHA512 3eee3d165bde6fc820307dc7483f228c7774237df8b5ddb0e5089b0f76fd3061a0223f2b1743f38f9facfb41a78deef0256ed4a9514431471265bb86ab64631d DIST genpatches-6.2-12.base.tar.xz 611100 BLAKE2B 9e3e50edbd85e9909351304b292de87b74f8adee2a99a2d5c6f858ee195e8df08772f1b1167899b52964b3d7a2595628d0e0e6c7e6dcc79f53b88434123ca308 SHA512 9923a3d4fa2f2310954b9d803784192b0367c286880c15af34e63c660ee593373a51d23561be0d1bbec15d39f1b57b345497f5cae3c73535c1caa8e62b8f43c4 DIST genpatches-6.2-12.extras.tar.xz 3808 BLAKE2B 65df0f1a93ba2eda0ac31002f723d5b730c6af33dc60dd8a6f942a6a0276feafdd12463017164c5b782c031748829d812079290533268f8df497a8b10e1ae4a1 SHA512 f91ff719f6cde159026bdc4a76432bd195933d34dd3e7cb3ef0a2dcf18ad6786e2a4f8bab423b1b1d19ace3513c02e048a491f4ca76f37bd211d5579361bef6b DIST genpatches-6.2-13.base.tar.xz 700552 BLAKE2B 53187881831a5ee8ac1581d78d89b56d5e6cbd45a1267f294312fbd648818530f029280b6face5c1c7f7c6d2c13c5e3fc6d1747f4abea8b2065f960a42a45d2e SHA512 2ca287f97bb3c01291eb5faa1de40827d014547e2cbb5063e77597e027f58672a262bcc51f1f2111cb5621f75b59c61a3cfa40f30fe8bc923136f8de3dd3e1ca diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.25.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.25.ebuild new file mode 100644 index 000000000000..7d50cb442f7d --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.25.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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~alicef/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[@]}" +}