From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1484487-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 698EB15800F
for <garchives@archives.gentoo.org>; Mon, 6 Feb 2023 19:04:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 33A52E0817;
Mon, 6 Feb 2023 19:04:38 +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 09CF8E0824
for <gentoo-commits@lists.gentoo.org>; Mon, 6 Feb 2023 19:04:37 +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 DF818340B53
for <gentoo-commits@lists.gentoo.org>; Mon, 6 Feb 2023 19:04:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9993289F
for <gentoo-commits@lists.gentoo.org>; Mon, 6 Feb 2023 19:04:34 +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: <1675708862.408a308d55d9df14aaf28f0ceaef6a98f4d3aa58.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.10.ebuild
X-VCS-Directories: sys-kernel/gentoo-kernel/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 408a308d55d9df14aaf28f0ceaef6a98f4d3aa58
X-VCS-Branch: master
Date: Mon, 6 Feb 2023 19:04:34 +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: f238b2d5-a1b0-49af-b62e-f55867849515
X-Archives-Hash: 3427285eac89d630ccd37622461b8df3
commit: 408a308d55d9df14aaf28f0ceaef6a98f4d3aa58
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 6 14:25:38 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 18:41:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=408a308d
sys-kernel/gentoo-kernel: Bump to 6.1.10
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.10.ebuild | 140 +++++++++++++++++++++
2 files changed, 142 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 084705955b8c..e3291d31165b 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -24,6 +24,8 @@ DIST genpatches-6.1-10.base.tar.xz 591388 BLAKE2B 5352d923a1df59c38cd1061ea94540
DIST genpatches-6.1-10.extras.tar.xz 3804 BLAKE2B 2a713dcd63d5946368d0bf88fee904b05f3fceac266173aa3016c528cfb40eff98f7aeaca2fd67e52a02a39b80b430fd55c8abd65ff5e61dbb6e6cd6ee757282 SHA512 152c134efcd7ceeb233bd7d9211a871d6b4f633e4782ac73657d583e4f149763e37ad7cf0f19efbf1c4c25fc50f3c67167b15f024eabfcfcb016b1cb23c36ae0
DIST genpatches-6.1-11.base.tar.xz 672088 BLAKE2B 29cabedf32ea3f8cb1ca75bde23955e4cc23c54ac93f8dbe66adbca1b1af4e5c6b54e60b84ee95bf48f9432a844aea279e89acb3a15cd8ab67e5453fb179c9d4 SHA512 a840a15204d1f1fd9f809cabe01cb0e37756cf1ac89181b29306e6a3b0ea3ce5e8b48b2402804b096106d0c4a0eb2b318e4ad3eadfeee4f266e6c3b6c259a6d2
DIST genpatches-6.1-11.extras.tar.xz 3804 BLAKE2B 9ecd609350e0ad98aedd70e1bd6838fd2d933576dd2236bc111c13b46623adba926bb1547349a1e9e35f3e90e0ef0b29fdc10bd38e3c4c5aeb3cf92b2cef9ff6 SHA512 f8aa9ac57c51f229a8a940ca57b401ca7c5b46cf40cbc1ccb427b341082c2f52e5cd945c548b2fe809935ffb94d4c8275fa4011510239d38ae13b338d568253e
+DIST genpatches-6.1-12.base.tar.xz 678732 BLAKE2B acc67136abb35e0d9985bb55002467e9d29797bcd560306511a58093ef56f86251531e54ff615dc3fee71f99633dfc372ad7bbe5a1ec2ff03d9fc23be5de04a8 SHA512 83fb419934c6314dc700f5bc9eaadf1909fbbd45dbb0e86269d942ba7f18162cbacf0acaff705144c271eb29b57c3a8027af03a73485dc887f551c002033326c
+DIST genpatches-6.1-12.extras.tar.xz 3804 BLAKE2B 59da490e3869e0b9c715453837cdae6d40b67156c966166e4d6f809e115eb9f621668a46f2632bd5eed894cdacaa5e85d26a5ef0467f95fcdeb3da3f9319a1da SHA512 d62321a73145f6275753245cad5d55b06e5fac89c7c7ed613a376c21181644e88bda7d3f7ee6f54c686bb0e534f6fdba3fdef8c9bcb06f15117276253b3a7e36
DIST genpatches-6.1-8.base.tar.xz 477364 BLAKE2B 29fa8d45feed6333883e1f4733ace6ed52b5424aeeada3e71917a0e3d85f87a7b99f0863ff468e678ee5631c6e0f0dd7c3a0115a58d80512ac1a27d58a2df149 SHA512 d1f32215ced0ed39cc1c6d224b1a12ae3f80bcc19f1ea23189e853367ebc661c74d17d335bd615c2fc1f3c21271f6f170a35caa38194b2dfd09f78e405739ae0
DIST genpatches-6.1-8.extras.tar.xz 3808 BLAKE2B af83b01895f1b3af4c0220a89b0dabc3642e578920475402c02dbe0300c520dbc621a2245eb66842addac48565c8b612198138c49491dca7909d594a9d2ef818 SHA512 22f9378bc7b4413d60672656c2e73bfbcc6debd10179a0eb2b523bceb5f3adeacecbd433ede3aa057143163a9cc2971d5023d73ac8187eaad59508dd229feba7
DIST genpatches-6.1-9.base.tar.xz 544936 BLAKE2B 9152c33c4145f99daff4f436afcb621883d21fb05be5821a045b47be2880250d3ccf1210f3ecec0241ac41f57581da737053b86852760cd11efc524719fd0f6b SHA512 88b6bd131dfe53a51a9a0dab13ef2bfaa4818d4b0ab93e485346f96fe58a64b7338d9aa4483c751d9d1886818ee8700918721037b03f868a3b2cd9d5ecdd7799
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.10.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.10.ebuild
new file mode 100644
index 000000000000..ef74508c882b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.10.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##*.} + 2 ))
+# 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=g6
+
+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[@]}"
+}