commit: 1763e713c27e8f1fae4fd294d25ec5eaebb13b8a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 6 17:55:59 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 6 19:44:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1763e713
sys-kernel/gentoo-kernel: Bump to 6.1.23
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 2 +
.../gentoo-kernel/gentoo-kernel-6.1.23.ebuild | 140 +++++++++++++++++++++
2 files changed, 142 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest
b/sys-kernel/gentoo-kernel/Manifest
index 9c575d0e0fde..178adfc5268e 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -48,6 +48,8 @@ DIST genpatches-6.1-25.base.tar.xz 1200876 BLAKE2B
7050f6e95a28f5886cce9b53823f6
DIST genpatches-6.1-25.extras.tar.xz 3812 BLAKE2B
f73698c57031c9d7f5edd9ba2b865e32064c38b528649a8144f856bacf35ae3570d1fc936ee25a88bd52fd0765fff05bec42686b8b3fc5566df187bd57d59be5
SHA512
ac2bdccbc6bd1de82cbdfe4edac978e068445b8e064bcc6a833b04f15b86592304c19651884dc0769719ade1b220c8c0f704beca240ce24ab370621ad6849aee
DIST genpatches-6.1-26.base.tar.xz 1261204 BLAKE2B
c8e9b6f12aa7611fbef190dbe5eed519ba31db4f3a4a59171cd3b896dea5dde47acaced603aaf71fda200cdbc6d068943a58ca2b90c259445a39fdbedd19b8ba
SHA512
648a85fe97e4d9754796cddc432611cbe62ca34747f86e088c541fcda75590445dfb4edffbff5d8358b7822c0bd60fcbe48a96a5c1aa9e0d5e168664e80ad8a5
DIST genpatches-6.1-26.extras.tar.xz 3808 BLAKE2B
061dc90cf89ea3876aee7cf9533f33538134e186c6e7daa6dc45ca0efc671822d9b3c3b8868b54978800da24cd550e5433ef866bdaeeaaf326fc765c66a69f7b
SHA512
fbd23f38483227af5149cec04cbc70d76f962a15517e85782d0d15e4f55be4d4946ce774a8eaf697483b5c1e047ae83a29988202d782ae9038b6d946d23515fc
+DIST genpatches-6.1-27.base.tar.xz 1321772 BLAKE2B
8d46e2a7c0023fdca7f30edf56f1504235dfb9f175393dbc4494f58c9fcb4402f0e744bf8f855baf66f3e71531efbf1ed9b2aac7a0143292c336efeaef665eda
SHA512
4fc05627f050986dcae332bfae4c582d308f195393ae8cf00c1f32a73a42be0c7178eb5b7e0a4fdd996b203702535523e33b65972540b3a97da3dc1662c49f36
+DIST genpatches-6.1-27.extras.tar.xz 3812 BLAKE2B
bd1f13817906296ceeb943a211abfab4dfec495734ca97031ac901c0b8a644e558d161d843e2e09810f2d39643adaf687ad2c7b5fad78167b7bbcedceeda0e94
SHA512
4d6d2bb3a722a1c82b324ab4924a1c2a6b6ea6afecff19f1ebaeb93c542efeb176130f938d7a613c4e11ef809ccd3abe0b4df8c358ce297b5662b36c3a06dc25
DIST genpatches-6.2-10.base.tar.xz 477872 BLAKE2B
e95784495c97ccdb838e9a9d206c372545b3b06e5bd58c29c30d14a6fd615fae205934c665ce018b58b0f53534e5d440240079489da5c26de64913c50456281a
SHA512
6f3730dc20c6a700f403fd8a01e0cf0b5d871e10c415a808ce91c53fb43e0c636c9e2767eddbc61d52137675a2a620d0efc7c5b48b06906ccbdfbbac8c927bb1
DIST genpatches-6.2-10.extras.tar.xz 3812 BLAKE2B
f4a8c6c516e523bdd18ea881469ea19d8b5ab77b989ff79a71690cd321ae8c8f323801bb25f0861e1f648cd4162bdfff3a0858137fcfc20db6a2414088c8b994
SHA512
098b6c26dff1e420314cc9bf3e716d3c946b7f3ee8f2117744dd050d9a1cb266e4622d25b5d61990902dbec4e98ed46b991b10f15e43697ee61ffccbbf88f485
DIST genpatches-6.2-11.base.tar.xz 543376 BLAKE2B
d034518061bff5104d3659da0cccdb7c9a17cb1c158ba123192def3b5b9e7ac49a4cdc3a4f040bf1c2c785941a84a17b2aa051d0f6ae5e52b5f589233f1796ce
SHA512
6a6bb723a981b9fe935763e496c50316349e5b2d3d2dda8638b5500a9b6b398009c038eb1a1806c39fd4057f72b95074e38d649c04a33cd22b7bc6a0b21e1797
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.23.ebuild
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.23.ebuild
new file mode 100644
index 000000000000..dd5577ddd24b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.23.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/~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[@]}"
+}
