commit: e6cc43a025a182764bd6071655c421f4fa283bdf
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 1 11:38:02 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 1 15:23:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6cc43a0
sys-kernel/vanilla-kernel: Bump to 6.1.115
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.115.ebuild | 134 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 99450a205692..c72a8622f074 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -38,6 +38,8 @@ DIST linux-6.1.113.tar.sign 991 BLAKE2B
ed6603860c64bf1219118c3490e350a5f79cab52
DIST linux-6.1.113.tar.xz 135242176 BLAKE2B
5a83f6542cb68eb19b851eda2d304732e3169433546b21c7bcc86064e6d1e888fe164d469f517419417398bdfa9b200877aa9bc83cb84f75e7224556ce5a353c
SHA512
75b9b37b57d588a47bbc39dff06cf9214894616ac3a28ca9039a42cce8cff1eb7ced304ae892d0e6502dc540444d7708844bbcdbe9ecd50e42f5979cbe69a460
DIST linux-6.1.114.tar.sign 991 BLAKE2B
9b4b59689d896ef9a00dd2386a7378d3a96aa55e324f045904771ec5c8a9423208ec47666cac6ca611b6417db9b7ba369828d5e77cb268db4d2793df0969d2b1
SHA512
8b613709d8f6cf98aeee5579c0d6cc76cb99bd494bb083f56835bd0e3ae7dad8565ac273965f2eedbd8453eba574066e57cb297f9d5035dd367a8bb7f2e1c574
DIST linux-6.1.114.tar.xz 135213612 BLAKE2B
879ffaaafb2fafe57d99a614d1f8065f4b8e6fd60c43723d815a66e226caff6bc5d80bca7c9cd1bb7bec1a170cfd3789c4b9dd779eaef1530eb61971c9925e12
SHA512
6aa571b2489b075824698901393fd80b48a5cd44142e28d7fc71c329756adf8ac9a9013b86354a57d82dd155ba401b993837f1cf6d80d367297b741602542061
+DIST linux-6.1.115.tar.sign 991 BLAKE2B
9639c64345c544bcb442df436ef400eb87096c6a9be67e5e24271e0f564a35b0603342fcd88220ed92b984899a09a77c7d4c563219e7af719f5d4b803a79a0c1
SHA512
df318b8af07dbad930c9468dd195c26c8e9e76aa61a9e79983e4c14b89df9b3e5bd1ba0f372db0731dfb6d0f52bec2456ab13e5935eb1924ea3e1d0b52d16632
+DIST linux-6.1.115.tar.xz 135217180 BLAKE2B
2b5a46ecc12d956dca075d37c7a8798dabbb126fb30209ebc82ee5127616fadbc69bb5b31ddc7e4bc12222e3ce877af9fc104f3097526871d6e49474a54bb519
SHA512
3ea345b87b2b6c876fb8742ff9c8eb523ebb4e2ea18390c6a11009573c246ab326d514dc49a61f992e5df20fbe6f955e6a64ff0ddead4216e7f25bfd8b227f3f
DIST linux-6.11.4.tar.sign 989 BLAKE2B
02f5f722791780eee6c0e7da79adb00b02dbedc6fc3a26b24afac66650358d9702036efa1483b6f734cdee2aee930c76ff8712c99697af6a3a84b92deaf78fcd
SHA512
cdd9f8f3a08b2087ac9aa9994c2780812ecaff4d33e466101c9c2574c95551b47d2f54b27ad2e62abe9db9758038bdae3ff1888be0fcd27c78146a871cb55013
DIST linux-6.11.4.tar.xz 146936800 BLAKE2B
0c77f514e29881b27b8bf815a55845b65182a25be006815541c0e843c2bbc0d12ee978d2a418d779d296c361bbba2d78ff58a0c13ae78382552afadb1e43aaec
SHA512
6685d71d60b6bb1b1bed104d71ca99a4909425f13d16be93e1cc1d9a10f3a03b6b55febd225105fcc423cad0932a3784e6a8b6e8ff3a8563adda6378184648e1
DIST linux-6.11.5.tar.sign 989 BLAKE2B
03ddeca59bb70744cae46abce20dd2b7f35e299aff419476ac657722092f4e35f98bd5aa95a142928ca642a3fc7859fba5e0f70de1c2cbce8015f0df8a78d1d9
SHA512
07bd2b0ff4b3940eb274d6b9e5ab1fb17ec18a2518a336b265fcb20f36d56121a4b03dea497ea86a9009259f73d912a393c71e2641e75ddf1354c9f6862f50df
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.115.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.115.ebuild
new file mode 100644
index 000000000000..3e7046d330c0
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.115.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2024 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.102-gentoo
+GENTOO_CONFIG_VER=g14
+
+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=/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
-xf -))
+ 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
+ arm | hppa)
+ > .config || die
+ ;;
+ amd64)
+ cp
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ arm64)
+ cp
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+ biendian=true
+ ;;
+ 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[@]}"
+}
