commit:     d46bec34ccdd9748dfbe89cf399f91596d9f8b46
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 05:59:19 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 05:59:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46bec34

sys-kernel/gentoo-kernel: Bump to 6.1.49

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index a1cbbdefe0a6..b08ed3cdbe31 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-53.base.tar.xz 3225656 BLAKE2B 
d701a2920347788f343b14babfdd1
 DIST genpatches-6.1-53.extras.tar.xz 3812 BLAKE2B 
ad3b65af5b05947d20e1ecaaabd7304261310162c9ef679cba698712af55e7bc5b18ab1b69613a4442e38f362e34a9a1699408decd9016cfb4543c33ac97468a
 SHA512 
a813b49a8af0cf17e48a88475731b6349dfa49af90e16037528eebd55a80b3ecdb52805547a56003a463b00a4302a779c8fff23970d73f3393cde7f205e92d32
 DIST genpatches-6.1-54.base.tar.xz 3229684 BLAKE2B 
60e1d4729f621f5f9edd07d3cf4b61a6c14959379cedd634ec1cc492e8f68a9519ebc05b37978fb3c26c21525aac38ea455a5df98e39444fa8565e82e3d02869
 SHA512 
39e15559c44a613b73c012da1f7ee058de9b4ce04e30ebb98b308bb9252ebe36fde70888e0aa1879b6e13b1653029919ca8bffdb57b500181885e72aeef63c39
 DIST genpatches-6.1-54.extras.tar.xz 3812 BLAKE2B 
c8bd1937c8cfcfdcd0b8c52b947c694535e0375dcb31e8a7ec8426432ddb92a559e6e90b08b086552df6d822d2b26ee3afc6a8607bce820dc9741d169bf0579f
 SHA512 
85f99d0e347036dd5e23dbe11ce1a0ccab042a9bd6980d8ba6cf9fe5e0504ca207e99084b09b011e77dc1d0455e818db87c171cc3857b3e8bc025ab0746c46b1
+DIST genpatches-6.1-55.base.tar.xz 3230904 BLAKE2B 
eaf52b27c1fbe9d25a27b18bc6eb9462d563c0c9c38ed4cae24a8f10cfbdda92c830523a5cd49aab16959ff860d5b10772f5a58eab10cd0796faae17baf4fdee
 SHA512 
37c236a79fad31a9411ab28661f134f697f6f38242f12f5b06e45a80a101e1e2ec50bb77a3fd35aecf0339dd8df82d5b84b1f542316e1b73bd1d2c796275c6bc
+DIST genpatches-6.1-55.extras.tar.xz 3808 BLAKE2B 
de074120fec5b94a8378313fd1c14166ea156008d679e53fe114d2a477ddc8f83e2b64ead63a7b43fcfcf4f168225b8ec2de7383b8749c661b493139560e35c1
 SHA512 
88d6c13ff77590b1240e7958cefa8fb1f738df2b56aaa2ef2e8b63ee4d67ccf87c3da3a9fb6d781009d9c9a8db4907418a9af2f634d92d858fab4f33afb745c1
 DIST genpatches-6.4-13.base.tar.xz 708424 BLAKE2B 
35ac10ca68775c9e9c5668e9d4a8764c6cc583f8ecbade54b6f1bb1e4ca41fee1d48f5e782a6ba271d0b2f710889aaefdb13c9e4bb437d4f91b05a3d7e464a2f
 SHA512 
5c3fa0b3c09b5298b4bf6542960e07d9c63875cc84821bbd6ef70556868f33a6aece33b9882b97cb9e32536ebfa536a71b9113e95b1b72b80c4f1348434e43c6
 DIST genpatches-6.4-13.extras.tar.xz 3696 BLAKE2B 
e2e9014e497de63eae5dc5d644e1ef27fc2fda99379b881af096874bf25f269212bbd811781f3fc63fa896285e78cb9c41717392e59bfa62c039dce58ed11f86
 SHA512 
ffa3f9043767ae00e18b1d5313df6312d179b0d9e2b224d7b1097cbdc9c48f56615a36425ae1fd00680caed085420e438deb4fd331a37cd4397a814e542d6fa0
 DIST genpatches-6.4-14.base.tar.xz 765548 BLAKE2B 
e1d9bc63a0d8beeeeef9894b264ef4d8078bf57a3548548c08e75e699420731cdfdcf9df69ab6844a57563f24d806c96c27c9a158a7f6a1afa72bf8328ce60bc
 SHA512 
5ee620824e0c17146add7f9bfd1d3444e5eb497444c040dc0f06a7ba247e81fc30eb8c92896ed359c7192690f24a1c45bb3b767bc408e9430ad9c7095ca2be40

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.49.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.49.ebuild
new file mode 100644
index 000000000000..7e128b87c8f2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.49.ebuild
@@ -0,0 +1,146 @@
+# 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 ~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