commit:     21b2a59e33ecc58db11059e345adcd12d719839f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  6 02:30:09 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul  6 12:31:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b2a59e

sys-kernel/gentoo-kernel: Bump to 6.1.38

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.1.38.ebuild      | 140 +++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 981791cbee58..0600d2dd6743 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -48,6 +48,8 @@ DIST genpatches-6.1-41.base.tar.xz 2664364 BLAKE2B 
411463f6532b87253491c5b4d05e4
 DIST genpatches-6.1-41.extras.tar.xz 3808 BLAKE2B 
af183a6fd9ebd81ed22f8ecd36ba323e9c3aa438e72018ae1282bfd371874870a8a6d52b6488b1940a6eb65192cff46af7221967d4d473b2f3eafc963f0b5ed1
 SHA512 
fd26c56b8a9c5052e32c3ddaf7ff1379912f2aebc7b57bda68bb9f9bc0b316f8b5ae396e0547f205ab491acdc1fc9731acd87d13fdbb13508efbb6d6fa3154a4
 DIST genpatches-6.1-42.base.tar.xz 2681352 BLAKE2B 
8d16c71a41bba911a9ed73e8ff55794caf34adee41a757072db78f4168b6cdde0abb979cc5f6d353a9fbc3c5911e30642b5e8125c1a32fa02e9c946f157442a9
 SHA512 
be7f76ed509a912fc1913ae7f8dee0ae6b2351cd2175319b341812cb5fbf00b2adc053f9711a991324f40ce77c095ab820fd57a00b7acd006400fd10fc94b575
 DIST genpatches-6.1-42.extras.tar.xz 3808 BLAKE2B 
6a9159e3859740d4b14bd081aa6df1dbeeed5f322a3aa3df5b8cb942884b068e713815d7284f71ffcad95339928c120661c0b7a85e7c168b27d3daf88251bd18
 SHA512 
a6cb074fe4fafb8a336872ce7c5761ac1fe3e3e84836949803c4a46e9bf783d38a4ced188830158493f64518418c46228bc4f79f669258de5ac6b2e1714f7a4b
+DIST genpatches-6.1-44.base.tar.xz 2683644 BLAKE2B 
d0264b6d6456fb2e6a67c1240cd3fbb95eef61701bf953df6e25e37a12fb12702b57f66e30ac757f28d9d1bcd0f2fbc38775d5b73922504084ff95f9fda1d78f
 SHA512 
e3777a612facad029782fe63abc702af06197521fcf90f4c80311fd7ad94739209573c7de910dfaeafd88948c2c3f3d29bb27f4fa1069475295b6f5b29e14116
+DIST genpatches-6.1-44.extras.tar.xz 3812 BLAKE2B 
bd5605700d0b55036d186eca82031f1d38883fbb3e2e98f0b44269c914f5a2912c026bebfdfd3fdcd563b97d3167fb9908bd0e29422b02e9314392b3ad2281c5
 SHA512 
e274c0e50fc476bc071fc4d77623b75cdfdda51951f541f56bc4f8ab53da17e67f615c37d35c93290d20b51d3ab2eb923a8e147daec4c59d3d1c87d3e803beb0
 DIST genpatches-6.3-10.base.tar.xz 593348 BLAKE2B 
e4d149963ca7d441b60d40af98939acdcc6163a09790ce103c78d33aa554de170136fbf8a4aa9285c5bde7fdd3cad54f73152d56038d7a299f8e69158b420d50
 SHA512 
7fddf9a02d8767c0236d8c3e1097a267d7f4961308eb08826299b596ba96b1e2fcaa84c22d986619e99aff3817f64fbc3740b87e5d0e1949dfe85d7f5450697f
 DIST genpatches-6.3-10.extras.tar.xz 3808 BLAKE2B 
7a4885c76a17d73d7f03836d243bee424f5d4e4205a6547f1b4fcb709f4f6c2c4b1c61dd542b260a3e8dd724f98d851850eaf0930233988670c674a8a2928bae
 SHA512 
f851bc9d10ad98ee74fb26344236670c0aaa218c4bf24eaf54e6376ca68d0626cc1d8f954a1dd3b61343dbd41a286d7c8d9a743ab50c295c0c729732cfb231c2
 DIST genpatches-6.3-11.base.tar.xz 641372 BLAKE2B 
4b2463552d359412969bc50e8c46aac52c23fe83deaff66eddacb48148921b4f88b019bd05b81f4ae2eb71710cad18613e5001dd4ab999d461f35cedc4c31409
 SHA512 
7632ff13835b971d44f582853cc54d539bde0ef1ca511ac179ff49143c1bae21e82da0048b6c45d36da5aefd92fa788b108e3f01d6fbf16534394ad7b143833d

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.38.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.38.ebuild
new file mode 100644
index 000000000000..c338d2cfc68f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.38.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##*.} + 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 ~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[@]}"
+}

Reply via email to