commit:     8d26e749fdd443d4c1ec2f49b058a23ce33e2100
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 17:32:33 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 21:11:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d26e749

sys-kernel/gentoo-kernel: Bump to 6.1.72

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.1.72.ebuild      | 146 +++++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 0d08f02a59ed..d7c150c69f02 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-78.base.tar.xz 4233428 BLAKE2B 
489c688bdce6b557065c5a2c63b35
 DIST genpatches-6.1-78.extras.tar.xz 3812 BLAKE2B 
b06900c35aba0f1866d2c64a71785afe6a8b6ff0abe12a15f02475470e6f327c7ea35df1af5bcad92ad0cb9aeac030f0c4328beb69b1b74cf9420ac7a38555cc
 SHA512 
d3b76b5301b4d6901ef8ae3589f9a3c948a2c88cdd932e748991987f45e4ef8b19b9b7102db83210ec17b67b00ceb597c22722c7ba3f66ae7be76624a1564522
 DIST genpatches-6.1-80.base.tar.xz 4275520 BLAKE2B 
b52031561d29cf853f17486ab4ba258a6c91d5d4e925217b9d8676842b1134ac25d50150fb10af462f1a1610bb461eff08755e326fa4b70862f4bc2d0c535c3d
 SHA512 
f6f07291004ef71610e140644f6f34167eb2097100d300d5302d684915415f16c074a6f37f0409da6b6bd5ff4b464739a8d565f1c53096b17616a0ecd09622cc
 DIST genpatches-6.1-80.extras.tar.xz 3816 BLAKE2B 
9612466a57c8b6bda84fd8e152de1daffd413214a51fe43274c9051a1ceda511faa7a6acc90264115a786fb9225f77b7fcfeaaceffe308237b5ac1643f1331a9
 SHA512 
54a4e8eec2f8034fe202b98dd182dda8764838877e0fde11f01c2a69ccd340f39fc0cab1b1d6b93c5592f5238b1f4a138b433552f7009cd5b0bf60a25bec6c6e
+DIST genpatches-6.1-81.base.tar.xz 4334960 BLAKE2B 
9ea7c823ceeb092badfbf1c47bb59372f489f136906b24551917b47d554d70cbed64172a126b01420a47cc99a8fbaa554589ee95a117a3582eb7969d2af5f6ca
 SHA512 
f18d383d39113652a3dad371f4656b49f7c87be4697b81bb2d0eabe2dcb97b514f4812d9be45a0fa62348508c6b0a56478bcdac828f7a26df3f1219d3de56194
+DIST genpatches-6.1-81.extras.tar.xz 3812 BLAKE2B 
6521612c65bccd8ad9950aa2d613ace86229593be584c69655df14f2c450dac73abcadfc5b0df878f01ca9c689d1ce657300a2e81595f134ae236bc254fd2150
 SHA512 
65fabe58523be0de77ee5ace810ab3583e2e1c8ed957bbcffe46ae89f9b09c2dd85b9585e53b9a3befb92d9765fcf42636ee8b53dfbec5428436277a23a8d757
 DIST genpatches-6.6-11.base.tar.xz 649760 BLAKE2B 
d435eda1a18196b24c451ae605c719cf5a45c255b2017f1b7ab3612df3f4101c003e615589841d02329e44c3411b4cb27b577e8ff05f09e9349d38e622b823d1
 SHA512 
b06c66f730e4a43d8730c5c98661b6061485696375d2bc623b818303b0f6f15d9ad9da318bf9d3153036c3d8a2215fe12c5fd8b789775027c5c21f2ef8d93c4a
 DIST genpatches-6.6-11.extras.tar.xz 3704 BLAKE2B 
a5ec7394f611c491ae0867c4694fdd000a0a53d6353832ecfb702f6b86711d7c955f0e4a8d10ee2cde6f2255a6e180fa26e3b1088f04902affa51d29f590fe82
 SHA512 
2ea475f922c98a83950441e86bd6805fc958f44c77866431b28da13d522d11841fc778945b253e292c8cd09ee378bd7e0169540ef12a9206d6341ec69ff463c6
 DIST genpatches-6.6-13.base.tar.xz 669256 BLAKE2B 
9474c68e1558162a583278e9ee510ff2fe8412a1b2b2a9c3745df47c97a4d6e5f29a8e890a5205f43f2a2985eabebe2a5fdb7567f399f0301e58d1751eeeb5a3
 SHA512 
fc96cd9ed40c05f2e8ccb821206a26612970c92afa0bd893870cb0a54e5d588d11c6368dc166a2e835324ba066e4f64a03be4773dda0270015f3031d7fae05db

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.72.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.72.ebuild
new file mode 100644
index 000000000000..1e3dc608d732
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.72.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2020-2024 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##*.} + 9 ))
+# 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=g11
+
+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[@]}"
+}

Reply via email to