commit: 12d2811d5fe0d7338fecd06c8fbe4f82bd34d202
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 16:20:31 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 06:18:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d2811d
sys-kernel/vanilla-kernel: Bump to 5.15.61
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.15.61.ebuild | 134 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index c4d4a25f7d59..d5953cede9c6 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -23,6 +23,8 @@ DIST linux-5.15.59.tar.sign 991 BLAKE2B
80fe92152ba1ec23c4cd3b1c3edf6ca8b4c381dc
DIST linux-5.15.59.tar.xz 126404076 BLAKE2B
c601b25663f73438daa40f1a72039a4ca6a027cd356a9cca3f00341a8aab0845893d4ac848a43a34758c0959e38b11ac8857777531cf1472b18f3373ba6c426b
SHA512
1dd5badf83bdde38dd43fe1f678b883200b6b4b52547281ebd0780ea1cc628138e5798e21a2eb4bd2fb71755808017fdff5c85259e2c3211da79fcc8fb87361c
DIST linux-5.15.60.tar.sign 991 BLAKE2B
9260f307fcc8726b5ccdf174ceb956ca37f0c835cd77ea8cdc001f927e376885adc1a7dc979034f4972715d3ddb700bcfec053dcbe436314dd274a076ee236ea
SHA512
992aa8c6efcb4406ae508661497645f8a128b5b672960e2d39c2341510e812dd7768f79578b3f99d02ee550781bf2775936cf957f0235727956a282af89ede1c
DIST linux-5.15.60.tar.xz 126417608 BLAKE2B
9c6dd581012cc21c26d2cf204eb92a2c28d9598bb8da1b884b6f78101b3b590c55f1b14d31aaf6b24e3b74aab3c2d00d632cc805d09ffb03de40ca89507a2c98
SHA512
b9d08ddd749c990a5e5413b5fe99f594b5b4b0a637ef3f622bd32d52d49126c0772fb7efecdfa998b2cbcf0de03f83bd76634db1f1d99f04098e252183b21b98
+DIST linux-5.15.61.tar.sign 991 BLAKE2B
2b55c19796e82179efb226224861cae71de77343ce59ef85d2f699ae74b7c0f65a0b9a0e4aea8ba1e05c265b1b1c9188e50edb8fe641be4a3983959ecf017aa1
SHA512
52ada5d9972f41ed01fc98e0b2f865083a2bfef38a697ebacfafc8e30abb1d763fb34b998761e786aab217266d3855687bb5c2cb6bf92e1df99ee3352896b003
+DIST linux-5.15.61.tar.xz 126415308 BLAKE2B
5af05f98a2f563dc87fa4c41072da9405a0a7f0183a6b1f239e9dbf597f146d63223287e5cf0635e4a9f9fb027ffa06400217f9387686a1356675921b34520da
SHA512
d2af99cab1b4fbc4ec43460662ec85a7a6f43cd20b8945de8168c5fcb1499afddf6468bdb5ccf89b2e487088d3b129650b77eae484718d2914698a82fc40135a
DIST linux-5.18.16.tar.sign 991 BLAKE2B
5309ae0d80fbec35f4fcdfb82e3f1fd99c96ad53b82efe4ef95f0f7ee5f04be1e97f69bfe664080ff92fe21b327dc72e723515c0fe43fa52f6a43d1894454a34
SHA512
01edeffc25b4221907f0b57aca694361ff5cf5fd6235750422b23d95241b2a1b2cd3ba0fa4b8a895e1996df49d577654a16cb302c798e8c7365ec536088f6660
DIST linux-5.18.16.tar.xz 129844784 BLAKE2B
60e9cc780af70242eaf3b41374acd8c11bb388a9aa17341aa98674e31a72cbd1c6ecf80158476fd762ed8955c6ded9a3ce8cd782ce0c956ddc3031c7487da686
SHA512
cc6813dc2c2bf8125159368e7b0b2812be220fd23cea98ec12ca727f3e032d313c80fc103abc55aa879c70105629dc54f14eed8e6fdfe00b9246bb850f86f5bf
DIST linux-5.18.17.tar.sign 991 BLAKE2B
ec46e8df0d2b2fa10b13a54284f46e058d2bb395599ebcaf5b5071b7ad61ec81673a73da4a5c09bd6603802d53f49b087e843f8b07b3b3529eaf12d3538e8c13
SHA512
053365b23cc7468b96b89ce56a788f6b67257727f35ff851a2a2006b9ff5b606c4d8c007553e0b62bec5989ba67667a3d47a169f4db9ee18cb35b2e5d860b582
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.61.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.61.ebuild
new file mode 100644
index 000000000000..13b58c5c9839
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.61.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/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://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[@]}"
+}
