commit: fe47bb4720f728f4d46ef39821b6f19f8ff69d46
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 9 14:58:46 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 9 18:27:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe47bb47
sys-kernel/vanilla-kernel: Bump to 5.15.46
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.15.46.ebuild | 134 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 5776bf26cc64..70f5aad55e41 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -37,6 +37,8 @@ DIST linux-5.15.44.tar.sign 991 BLAKE2B
24fb4c7cfda2f74f08473d7a1a922f98f44c540f
DIST linux-5.15.44.tar.xz 126324232 BLAKE2B
bad291ee99c73ca99aac9dc99872373ad6a6eedd53e6a9d059e800a20b4c6b6573c3d9e7465454381a5d23a1067a256fd24ba459a674b8927abe19070fd24c76
SHA512
79a477dac536355b2a6c6de14ede675311d6ec179917c3f2acdadea16c81e706b1f9686fa3868a4a36a57441c2d25113632534ad8359a3544207e7068d0e177b
DIST linux-5.15.45.tar.sign 991 BLAKE2B
8673e0cb946b149c701bbf2921f561f7e44414b6c3ed44237579abed7a956c03aa50324081c91d9002dfe77ad3157dac0235bbd9edabf15aa76447657ec92f0f
SHA512
bb276dec9d856cc721aae7c30ab2b3d6c011889a83169ed9f70f5da4ccecaac0cd9391c5be15a4bc34336bf8561288bd19dea48b2a9f77e16d426e4747fa339f
DIST linux-5.15.45.tar.xz 126301288 BLAKE2B
02b2cb0cbb76d10062775baf9642b411f88e83954b6ad781c0594eec11d6ab7bc3e33465e97c65216fdef296db2efdf96dd9fa79b936e9b20bcb0bb3bf1cec41
SHA512
0a8e95cf04af68fffa3dfa23dd53e897527c8c574c91cc0601856a5cf25aec077911405bccf85307d3da51c5152a3f7daa99b6373d8d90124224530221cfc66c
+DIST linux-5.15.46.tar.sign 991 BLAKE2B
e0f482745e07787e3fd7ca26cd92f8e06370c900904f0ef4336545040611f5fc0448f685066a6124568b30af598af9c711860f849afbbe026739b24b770863d6
SHA512
742b03f68c45e82e39a249418d2fff89214897f1f41c1360065e529122f7e5d493041259e0399dd255060e9d3ceb761107ddb3026e3588a70f85d5e51ba781ef
+DIST linux-5.15.46.tar.xz 126348960 BLAKE2B
26fdc4bbed153f7a5a511b7c1a804f794dd6e4b8b44d0317a4cad304b2c824183fd6054b7ca94f22b3e49e22a13ec9dbd24373b628b01bdcdb5392eafe6b3dbe
SHA512
aed8ee53e8d70f4110db49fd6ceae4b4664855a4694c9abd2064057e04efcdf22e09f6883269bf383ac700b4217333e9bbdb3f4aaf839e9e479d6360b637fc2c
DIST linux-5.17.11.tar.sign 991 BLAKE2B
3f734e77a1f91684b02bcf8f612ebd3feb0f21039b4df551a369f0e1f86af342ff4e287aa067f8489075e2e4eddf4598f4f3ced15cb6e73ce7530218f48fab66
SHA512
980fffb64dc560882e9e9d9e6bd09e92ec802592554df95412138c4b414915912abe6691f7979beb555e4a23a2214e0f32b409ce988b5b8d8584bb763d84c21e
DIST linux-5.17.11.tar.xz 128457724 BLAKE2B
eac40fbd6589b315983d30e3711c5a71065e8447df607f6ad02a2b430f8f47bdef6ad5cbb7e43c94b2016e9d045955593657dd7e2498f1a04c6272307a579d2f
SHA512
cabe2594aa188c7dcea842e9bd31015a851d3ab3f7122b595c5c81701eca42fd223e2cc3667783a1a1f852c61b6e1045f6e361a642aaf60b545498bd1acadef2
DIST linux-5.17.12.tar.sign 991 BLAKE2B
df6f52a15ec4c2dc4bbd5e644f6a9c8d99b28eda652ceccdf7f2f6a292b7cc0b98a8e454b1fd43195e946965b9604a4c106752009b1b92693d4a269b93bff52d
SHA512
d3fe3aad151850e8dcebbf4c9d8190870fe0378edbeb9a026e1c64c0793af2e5fa20865a77218a6d94b516d3f4ad6587fe7d23b7edb158cad941aafe60b3dd30
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.46.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.46.ebuild
new file mode 100644
index 000000000000..0ef902726d5d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.46.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="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/mgorny/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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
+ )
+ arm64? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
+ )
+ ppc64? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+ )
+ x86? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/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[@]}"
+}
