commit:     aac2115f7a9bb12eb493f2c11f53ebb521907d2f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 13:35:55 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 18:39:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac2115f

sys-kernel/gentoo-kernel: Bump to 6.0.14

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.0.14.ebuild      | 137 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index aa83766383a3..4b7c247ab455 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -40,6 +40,8 @@ DIST genpatches-6.0-12.base.tar.xz 658212 BLAKE2B 
0daa718dd00d76224db3776d6792d5
 DIST genpatches-6.0-12.extras.tar.xz 3804 BLAKE2B 
fbf21f852110ac732124e5a227b38462d7a94ec17d788fbd48ab35e08c2a941f9c3549e58e7cdb4279f8a273daa2cfbde0a560a769d808ca9d26d2419b303b96
 SHA512 
efdc24c196c10ee2b47d6f81482b4408a5a7e829c21d9c2eff6426a92a1c17f0315c64875d45795cda7b735d183b7560ec44e308fee34b09e89c171526c9ee4f
 DIST genpatches-6.0-13.base.tar.xz 698372 BLAKE2B 
3069effafcb526cc4d2735e2bde48cdb7d0ba5e25748b2acc854d1503268b298e9f690e266e6e81b73ab09461eaa1f0ab3d68066997e51d27af7a051d4c5f84e
 SHA512 
a92a50c3f01266df91793c1ba4baf77aa758093c1e00d333050f8fc989f690240ab6aad53a31e59af95db918a15a5037e2542addde8f9fc3cb57d296bbaaee6e
 DIST genpatches-6.0-13.extras.tar.xz 3808 BLAKE2B 
6edfc9b381253851e8e2c976b6376aff9bf98648faa49396ec81389315694afda7465702fe99f54b1a33249deabb29ed81a6d1651320dbaebd4eea92ed5f3a21
 SHA512 
216098565a5eb046788413da37a7ea933f35c990f3c7f3726004470509929a9717158bd778d321333839490e2dfc1b733fe3c016bc3d06804bfd34dbdc4bec93
+DIST genpatches-6.0-14.base.tar.xz 701288 BLAKE2B 
ae3560178c3b887050f51e7bafd837ffa7755567c0748e4680c230329f52e8009e6f8da59e8f285bc802e318b65777b06f3db7f0d795584eba448b716ed20014
 SHA512 
43dbb5cf7b0ed9a4a03d484a58aaf94243902b8ab31b6b33de3826cd172f0978b08bac8e4d56f7ad2450e288fc66c6e23c9458c29e1f2a6fd3e1f015a4cdc07c
+DIST genpatches-6.0-14.extras.tar.xz 3804 BLAKE2B 
c12099272fc09f02aae38288969f12057092c6867728080744914ea7c9f41bcc0f80154afd7de2f68180e2d3f7f66899d2a8523ea0bc9850516110781339ec2f
 SHA512 
a639231941c13bea32e4c5ce4f56d6dff2b56a164af8481861f4ed3bbe90d406e2d1eb4242b4ae5db9ff735924e75c2241edb372ec9e6a9a3a0df7a99fca2e4d
 DIST genpatches-6.0-9.base.tar.xz 478548 BLAKE2B 
916f2b1b5d198adec6f73a0bb52029f4667132e7b7528ac5578134e3ed775d6aaac7989ec5e3827fe16db691f3321ef16b5a29088d2ad81e963f768f67cc2b61
 SHA512 
6b748f241e609d6191f83134f65bd9010122d5681b080c7ffeff8690f4cb1ab0f44b2681a135689d945de45f4ef25384411aea1d78a5b1c6248e547dc9e5297e
 DIST genpatches-6.0-9.extras.tar.xz 3808 BLAKE2B 
cf37233fbfc631e8ec9d7c663e8982a3bfb154573fa84d13cbb3d67fa73ff38ce74b27bf6dbf827b311826d18c628ef2818a75975e068ce381bc1a46c4948075
 SHA512 
b4f5d0daae3120662fb79e9f53b7dfd0c15f0a2b7c77a32b7440cc7425b3df87107aabb2cd913a31b7014c9fd1c3c85ab2081839af652ae9d7e43352dcdda42f
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 
44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588
 SHA512 
3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.14.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.14.ebuild
new file mode 100644
index 000000000000..595ff3e75b7e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.14.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 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##*.} + 0 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.0.8-gentoo
+GENTOO_CONFIG_VER=g3
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~alicef/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