From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1541619-garchives=archives.gentoo.org@lists.gentoo.org>
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 9263B15800A
for <garchives@archives.gentoo.org>; Thu, 27 Jul 2023 15:00:46 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 86BEDE096F;
Thu, 27 Jul 2023 15:00:45 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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 68694E0899
for <gentoo-commits@lists.gentoo.org>; Thu, 27 Jul 2023 15:00:45 +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 6B82B34068A
for <gentoo-commits@lists.gentoo.org>; Thu, 27 Jul 2023 15:00:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BD56BDE1
for <gentoo-commits@lists.gentoo.org>; Thu, 27 Jul 2023 15:00:42 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
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" <mgorny@gentoo.org>
Message-ID: <1690470022.388c526f88ac42eca60fac5432b88b169a95ae0f.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.42.ebuild
X-VCS-Directories: sys-kernel/gentoo-kernel/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 388c526f88ac42eca60fac5432b88b169a95ae0f
X-VCS-Branch: master
Date: Thu, 27 Jul 2023 15:00:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 2f036f31-6192-4007-8df1-100e47de1f62
X-Archives-Hash: 3a96d1efa71ebf01f8f8b69f009bbf1a
commit: 388c526f88ac42eca60fac5432b88b169a95ae0f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 12:07:29 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 15:00:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=388c526f
sys-kernel/gentoo-kernel: Bump to 6.1.42
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.42.ebuild | 146 +++++++++++++++++++++
2 files changed, 148 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 29b0cbed8206..5120a0843b78 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.4-257.base.tar.xz 5959056 BLAKE2B c3c4f47328f4e3ade669e1cb4586
DIST genpatches-5.4-257.extras.tar.xz 1812 BLAKE2B 480e82ea79feb52785fc6643c883093f42240395a1d953cd1e5331c012cf64c6f4b292e878a938a9c5bb297e96ab9f80656839de6044c9f1e76c668c2c8e1ec9 SHA512 5322116802c6c0a44abc81911bb83fd7d4aa5b5f7fb4bb35ca78c47c6c0afb188e21a24cc5ac4e2810affa13689c902e97062d66a751630cf0722a2b28b1d83b
DIST genpatches-6.1-47.base.tar.xz 2915344 BLAKE2B 7fd49099198e9af926911b3a8831208d6c0ecb5047e8bc7563aceb23516328a1829c33b912f52d1175440770ed0394aa6bb3438ad92a9a81ed28ca6fdc6ee928 SHA512 5c0841c92d0f2bcbc81599568d882bef066f132b670334fe7728797b76665aaae170ee2acaf942228d5065fc95493fe33fb2ec2268f9d2bb54739b463b346b33
DIST genpatches-6.1-47.extras.tar.xz 3812 BLAKE2B ea44d25a1637abff3a87ec17e397ef324aa08d7f62865924a61f55cf85df6a1ae5b8a56ac1f33a61955bb3ce71b28d628d34a600a1834583ab94d4111e9f4810 SHA512 9f8c831530609f2379685ec3bbe545f2bdca86f139233dceb0b10d7259b8b1207188a8f95237483b13f40c6639c6f060df4cbc67e09249c24424bc0bc83fe281
+DIST genpatches-6.1-48.base.tar.xz 2983620 BLAKE2B fd09d2c761c3652502d590ad189db668a27d48e2c0c336b1d2e96f9a90a3c365409d012319b6daff30e6039330b90746636e89d6e4f5bb302851b3ced0e57286 SHA512 5abc93002ba800f13d27ffa8bd9485cfb921cd8e43d4cc15325fa2b833eb334e062cbb9b751ff2fa285a7f61f0e0809366d58fcfb4fd4a71fc08f2e48669b5cc
+DIST genpatches-6.1-48.extras.tar.xz 3808 BLAKE2B 5f31be220d97582f049f58f796f0d509c1d2c82ca41efbcb178a9f78db64e0de0d0297096a6109c4989777cddc0957fc8efa7caf333737157a4b6352aaff64bd SHA512 d37be3695cd96f3226265c4f689aef9e98f0528d34b554e53e98fe9497e1b8a26ebe2661d8a04e9c84a615e1bb4966263358d759d228c950af3ce70bf6340e0c
DIST genpatches-6.4-8.base.tar.xz 414164 BLAKE2B f62a27a2a4ed9a80d830f5118c492c95b1400a149b9594e68b47011359fb02f5ab0a5f467dab50f730d56ac21bff0dd4ebf09251588a7bb4dda15aedc95ec729 SHA512 6d747b1b06d9fad9d53a293586e3bef465ddfbf2886ab9edee32b81282d4c7b8cf27d4edf4f8be1ef668ce55888ae21214ddc6dad0c2732698d23a77dac993c0
DIST genpatches-6.4-8.extras.tar.xz 3696 BLAKE2B e1d121a35ab69fac09e935317c18299817c65867fb7cf7a6810f560af913a254b411259a78b61c0a31518629ad33e13e53910fbd9701602c733016869106e088 SHA512 11240038d70202c53ee17763de3f60fcb5ae0dffc8cf005d324a7cd15a865313b9da2a3e74e184090b2d674ca1a1515a1db9f2efbff7a0f5361563fc7895e87a
DIST genpatches-6.4-9.base.tar.xz 483840 BLAKE2B 8f2796524871d00030c870fcb167f36bce2a990a248533b7bf481506f03937fc69ee34cc5e2b8e3fc994c8fb40c54f23ce14c922f99b46c63e9da7e449a6cbcc SHA512 ea23db4aac99667ce2393d7f639043c6169f0f452aa882060d009ead9ffe9b763acd2a88495114b1a691dfa178f0a82fc0df8f89546e2bc292ca643f918691c0
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.42.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.42.ebuild
new file mode 100644
index 000000000000..7e128b87c8f2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.42.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[@]}"
+}