commit: 7ed9f8e51f0d3d4c62bf43a5e284f8edb3dd6f66
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 13:40:45 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 19:12:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ed9f8e5
sys-kernel/vanilla-kernel: Bump to 6.1.25
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.25.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 770e7cf02bd8..b13f9c6306f8 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -45,6 +45,8 @@ DIST linux-6.1.23.tar.sign 989 BLAKE2B
419f3bd6e476139813cb84fd8bca9ba57347940a6
DIST linux-6.1.23.tar.xz 134868752 BLAKE2B
49e806ad62fda82dba900c008fe84bb977ddfb9a40ec46a8dafb0f7ebe77f767143a0d029747e24b088f75ac83bb3177ed33dfe10ed2e29b980e4287ea9b3351
SHA512
6b57cff7222e3c193f5b54f8381b18ee3f15544a8c8cd8c5c5eb5504044e2ade93744c0324bd275beecbcc1dc4ec650aed4a563ca575aae764b14c785584f661
DIST linux-6.1.24.tar.sign 989 BLAKE2B
bf2b7cbfad6063647456468fa6717affde0b101746565c296911d64cf78f5c3fa6d4356db44d331bbe7c0e8e42fa679e65f7df957a37ed4bb9a8683b5d8f41c2
SHA512
aa808bae49a938b5afde78fe6f5070eaafc479e085795d8a7a109791edbe3d49503ce42af839c2eaf9022d2ffdd43afeb36b28b79e8ed445c97c00d81c10840f
DIST linux-6.1.24.tar.xz 134850360 BLAKE2B
2f20ad999655226bc79caca109bde0f940420d87a293cf000f2d8304122bdfcc388c1a558ff26f2f551c9b6133b8fb120dbd537f914e1b88d0fbbd5408e648b0
SHA512
8dd946ae969e3a51d82f8c5383cb4af8ec457b5ad2174a09a39f86db9c3d5992b9c394652780ad6f31aa6a2d90a9768bf86fc9d15a63bb6bda1e1a031554d83a
+DIST linux-6.1.25.tar.sign 989 BLAKE2B
3e7435e2133f0eaf23b8bfeebf60acac9ebefc0866da0123a01539467b38f3a0adc57ad9640600d5d1966c7de0bcf6cdd7d228bcd18796800190c27848718d96
SHA512
66ee73299da49d5d8db7878216f608a1fdd2ab4135e718cb86d49a474064efe646c7ff3c41fc5cf70037b206ff07bd5665005382a5a73ec7327b67174e23a508
+DIST linux-6.1.25.tar.xz 134864040 BLAKE2B
a8eeec298534e825935d94d1bcdbd6224955f5a6715592a27bea48a360582b3c5f640b277a3f076948d074bb6097814a58dbee8ae9fa8b217588935d6c799728
SHA512
9060903458d10a836dd88c8c6ef30ef0bbcf543a166a40a98ec4710731702d89922fbdbbebee5a9f85c16e3fb5e005d55d675616b90bb9c700a7113f9155fff0
DIST linux-6.2.10.tar.sign 989 BLAKE2B
5e87f3049989c378759f28be42622fc880d211b68990bf0892f81137363d40abefc32ca2a3cbf27cc8b1ada5ede67e7c29f4a1c6f77af59a60f637454fc62c1e
SHA512
98bd960221afb83db7ad59fc693a2cbcc1394db0affb0a459af2fddfcc6ee441eceac9d322f60abe91258d45f88c6cb55fc884803167f8c706e826f0b9f7db72
DIST linux-6.2.10.tar.xz 136456416 BLAKE2B
3005c2644600e700892a6f20ed1e9f65b56b8891cabcf1acfe1432fb55aac86787f40fa7e197cf2519b8a8f5d737ed5638c7e1ab850b4694554a87be14b8a5cb
SHA512
56e55c4339f381fa4b99f50c647fb0c2339b366126f56ec91aa6a41b64b0d2f4cac2f18a0fd7a9b984616c1009e285ed9e128129d45d134c7c01918f11a846b7
DIST linux-6.2.11.tar.sign 989 BLAKE2B
d70a33f76f212dd29e2ce816510fa6e9382714786cf1d4e01fb1e88f0a32b288200673368534cb3faca2cfb22a4362dfa5d6afb7b0c15498b0b99ee11f8ebec6
SHA512
59195fe16a854b0f23a000517f5ac872269c41b3320c48f586ec3c61be3a17124c3d1f109a2826cd3cee5fa01f262b6e9e521520a6efa581b08e983352f86ad4
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.25.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.25.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.25.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[@]}"
+}
