summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-12-13 20:24:12 +0000
committerSam James <sam@gentoo.org>2023-12-14 02:15:18 +0000
commitfca7d4a2707f61de910447be999b0f643599c7c6 (patch)
tree7f9d6475b2672cbaf35cdff01233e346e320396b /sys-kernel
parentsys-kernel/vanilla-kernel: Bump to 6.1.68 (diff)
downloadgentoo-fca7d4a2707f61de910447be999b0f643599c7c6.tar.gz
gentoo-fca7d4a2707f61de910447be999b0f643599c7c6.tar.bz2
gentoo-fca7d4a2707f61de910447be999b0f643599c7c6.zip
sys-kernel/gentoo-kernel: Bump to 6.1.68
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/gentoo-kernel/Manifest2
-rw-r--r--sys-kernel/gentoo-kernel/gentoo-kernel-6.1.68.ebuild146
2 files changed, 148 insertions, 0 deletions
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 558e280da2da..c65d0abf69b4 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-6.1-74.base.tar.xz 4113880 BLAKE2B 26d9abc23f66346e376b78bb687ae
DIST genpatches-6.1-74.extras.tar.xz 3812 BLAKE2B 52488fe7154cf6e0153a05184699dd1597a078a7a376e2866b68b923e7f82300757d1c70e7bc44920ab7813d500fb3d4677d49428261308e4b6b59a552381a9f SHA512 dd04bf075792824bf65cf349f6bc921d0c36cc66c878b8dfdd95c27f3a82de426d6725d79c02374e7372b74b68b9c0123875476de434f85646dd9aa8382d8de9
DIST genpatches-6.1-75.base.tar.xz 4114396 BLAKE2B c21211d430392fbe96b0616e0ece650736f7204066222f88b84cffdbedcbda78d8fbf30ce8dce4c7fa450f24410fba1af1929ee3b3ea0472fde3473db95a0f5c SHA512 106db04baa9ef92e324929d025bb68f9eab4d0144d12a3d11cbfffb018cc46abeaadc76240c1acfd3877ef8efc1992374ad15cca061258e5f20452e3cb71b90f
DIST genpatches-6.1-75.extras.tar.xz 3816 BLAKE2B 6e34ca62609c5ce63e7accb16f0c295bf9a38602d0c11af80c81f12744c0d90aadad86164b83a362dfdf70301ecd879eb67066544dbcdfd522d767e103a8592b SHA512 05718354716e8c8a4bbbe94923201345e2d2e75274973114878d46bc34ac2dba4d7d5beea333b4823efbbef65449bad615733c0ad0c6ffc6e1b2595ce0e45d38
+DIST genpatches-6.1-76.base.tar.xz 4170836 BLAKE2B 5f3d0f64b1b884d8401076e752e27f2021dbe9fd729172d5ae75ed8cd9cf578585e7dfcadf24542a07d4abc8350dcd0d17d41521f94f8d9d5bc1858e00752f5f SHA512 d4fa7598e022029d80199cf3c236b92c168674111f9d5a07fd3f8ba8db76249578db47ed68c412de369165d5c12c88510556241002285287cadd9a3e4a7b12e9
+DIST genpatches-6.1-76.extras.tar.xz 3816 BLAKE2B d61edb2c2fb7ef815aca59eee532177c0452ccfb5896398200d704129e40daee6870b11c4758095fb6824eb015de46ac388cd77ec075e1d508c8a299bd4077a7 SHA512 9f90fc444beef2fcedae8fa2f6bb01492c9ff3fbf2a5f34cc17a52e5af9615538a6a24eedfc4e09575a03c67b339c4d964ac55e950b6aef11935d5f877862ca1
DIST genpatches-6.6-7.base.tar.xz 472596 BLAKE2B c5f69fa43401555567c9e5c3b5bad31ef55a3f49756f86e1e5cb935cf8cffb6ee080f411b5113dc3fb9d43224de432e6f1f6fb5a18082d269e30181e72aa1fcd SHA512 6098a5d32ff83fe2ceb094055be6336a19c40246946606fd0b39e86ce8bf53b96cd5539e6cbc774dc865f4be742ac3c127f8f48ff5cd3a50484dcd5afb7b9df3
DIST genpatches-6.6-7.extras.tar.xz 3704 BLAKE2B 1bd0d01aefad3c47f2b7bdc550e607d2c4ba8e0cbbdbe3ba4ef57e539f9bd894222ca6f01908e6bb27221de1331634a6941867c7d6bece9620510110bf276107 SHA512 6da82d251ac6c33b8d2837e1a44a32ab5106f0a5816a8e76354c7d9eef510b4f485edfb1b80dad68e59b3a96494bed590ba1508f7b96697c364fd52c97b65496
DIST genpatches-6.6-8.base.tar.xz 472816 BLAKE2B 503418967edebb8cb2020edab16f060334fc16c9f6ce7980b8e25e3db1fc4869571fd466abc8ec4add3a095d089f0c77532b2524fae1136c5f7ed487e90ccd3c SHA512 04a247aadefd43a9ec1382b5f77f18dabb1701469cbeabcaa1604405cea9112bec56bc9a08d33f9ce5ebb90b8d77a7c7a21774a10906f3c8a685c0d3c10bbe9d
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.68.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.68.ebuild
new file mode 100644
index 000000000000..92d3ccf485e6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.68.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##*.} + 8 ))
+# 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[@]}"
+}