commit: 9587f63359bd8017ed1f174f06878766e533d0b6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 12:07:21 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 15:00:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9587f633
sys-kernel/vanilla-kernel: Bump to 6.1.42
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.42.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 5015aeaa34aa..4b2796b8e265 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -32,6 +32,8 @@ DIST linux-5.4.250.tar.sign 991 BLAKE2B
9650c44958c2d5c9c7a7bb1226e2e58e0bd50ba9
DIST linux-5.4.250.tar.xz 112964116 BLAKE2B
979b6936a86a58b4d3c92af6ac32243a20c074e14ec914421fe0605ef28a64329f25071bcb8a4aa09ffb78851c9f4c44419892d917affd9c9d29789ccb7c572a
SHA512
939b3986490cfdce0ebb214ee87c523cb3ed322729e3cdac9991ab6489c3bc5bfc08651680c3a4010bad98480a23ad28d799fb787b85969846f1e440c167f5bb
DIST linux-6.1.41.tar.sign 989 BLAKE2B
7b7cfd294a3d204134aca76464dfb596e94ebdd7d7657888157dbf217b462c7f63eba2081ddf29cd906323656aaf6dcba7191c7aab3ae4b5347817ed84efce02
SHA512
1918494a78e94b4a4d92e871de8fa003386e08c62531110147a7b11b4e682618a3e3a70591ef768fd5a9050d578899d272bcc4cb2873855cee8cb867dd5780b7
DIST linux-6.1.41.tar.xz 134912480 BLAKE2B
7b67b16cb45e8089a4554c59e5be29fef39acd95013345752f5e57af4f185cc79a5effb13741f643d7a9ef2c99555342cfeb1e859f38303be800d889a35972fe
SHA512
82101034257f746e1b6717d374a7960c1a83f93e8c2912e159c6eda6ea7605ff3c8505d37cc55ee0aadaddc964475c7ece4c26ed60407877d6eeaa7938de7c91
+DIST linux-6.1.42.tar.sign 989 BLAKE2B
043e225f5e4f885cca43839bc17cb6cc721635ee0ece73a983d2fdef9a82f0424e6f73f1b83666354293cd874bd6fd59c05ac49babca6244a2b6aae7c05e7008
SHA512
adcaa387bb4bd236f79f486e654b115acd4a7bff27887cc08de9b4b791659a73d55f090817d7686fdbc410d5bb9fcd72889c43048c979b65f88ff9c9c9ec8358
+DIST linux-6.1.42.tar.xz 134942580 BLAKE2B
27d506867a44764ca5fb71d36a1732ded064b8d24d2d53bd1b2158db53cc82283a390b46071ed0cd07fdd68a0fd60486e5ec231fc6247f87bc0bea9692d449f9
SHA512
b3a0c682bb2234c3ec36f6302f4b39dfd501e667c39d10e2f0994b3d3dfbdc461728686d4d451b798173a76fe2ae24d8a6ab43bf869e9291d1111975405db22c
DIST linux-6.4.6.tar.sign 987 BLAKE2B
9fb1f9d3f27a1b03fe375ab6701b790c7277102e69308ed981547008ec20ea9175e82cfc44c88fd7eebae121bb28061b5cc85179920e13734fc2fd4c3f5aeca5
SHA512
3eaa7b723118a491a05642fee7ecb7c0ebc4ad203220da9ce1eff49837ce6feb225f1f985ba00d4e4199a1405e1779fc8aae854333288b5abd75ce982027d9be
DIST linux-6.4.6.tar.xz 137830736 BLAKE2B
a395218ffd3447a9b22d248c7dd69204115567185d91d4abb712f77ce0b90571bdbcf0ea845ed4adb30d0fd448341d95c8be6e3acf46d940477d8c55d681a669
SHA512
e9e9cf4fd99a7247123066ad4e9fdc2d7bd491e602790120c8045691d43aae4f225e832426f542bc5288b87371cf1d55efa529d649655f77d2d002113da7f0da
DIST linux-6.4.7.tar.sign 987 BLAKE2B
c12f0fde753c629010ce8c852b629b9fe73d8e1d51b53aa183038b43a4650a2e3bf82967a7d3fcf0fc3ce72e98e4ec535cc476360a858de1a646ed99c48766df
SHA512
fa144baf9c848272e7f4264865035bc1fc63ba0857c8ef5e68b14975cc2bc27b06e24bc072da5d9f7673ec181b09c18eda61c465c4bc48ac355ff45632370d8f
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.42.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.42.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.42.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# 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 from vanilla upstream sources"
+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://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+ verify-sig? (
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut
1).x/${MY_P}.tar.sign
+ )
+ 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 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+ debug? ( dev-util/pahole )
+ verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+ if use verify-sig; then
+ einfo "Unpacking linux-${PV}.tar.xz ..."
+ verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+ < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar
-x))
+ assert "Unpack failed"
+ unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ 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
+ ;;
+ x86)
+ cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}"
.config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ local myversion="-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[@]}"
+}
