commit:     9adecb23fcaafac1de27f23abb91059e12cefead
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  5 15:23:21 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov  5 16:36:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9adecb23

sys-kernel/vanilla-kernel: Bump to 5.9.4

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.9.4.ebuild     | 144 +++++++++++++++++++++
 2 files changed, 146 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 2c97d2ce3a8..ae7060c5d37 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -28,3 +28,5 @@ DIST linux-5.9.1.tar.xz 115502916 BLAKE2B 
65eeccf077194ce03d5dbc1e8ea8f6022d709b
 DIST linux-5.9.2.tar.xz 115519708 BLAKE2B 
22ba992df3a1d73fa16efb31bb0d62eacd106fb6f4d6dd1ebe522dc09b94c8df689cdb594ed105076ab5e1be4bd00eb834019dc19b6f58f6bee04f53e5de961e
 SHA512 
98efc0d10e76685eb3280546d8d9b0251062a8ede05959d0de95df18414d2a07ced0a585ba58dd5aad188ad2761d7c5150cd8a8435a6bb53d692702f434732a9
 DIST linux-5.9.3.tar.sign 987 BLAKE2B 
9419f8d7a592ea26ced8022b61d04fbc7df8fac8fb5b0df58e97cf63d3ded29653ff950092d61be1211a23b91311fb7bacad7ed54fa6fd3e6823b9180c6adc50
 SHA512 
74e82b6e495ece56c3300d4362c55b91274dfd97121ce7290901c98b95ddf53c839cd45a04e8f5820865a12462286dd3105066013734e20d851a1498fe26443f
 DIST linux-5.9.3.tar.xz 115525348 BLAKE2B 
9f739fe4eb5d6ba38df54cee41d7342076fbd757fd25f50614ff3681ec9ed9afd9a5e134831a64e1fbcf4c31d2436ad2892cd6e9c50f664abbe6dbaa7ef2856e
 SHA512 
5207dfb30803e1daeb4025dbf2887ebd4fa37f1b5ddadb2dda1f2ab1815309ec9d4a9fad61922b0ce28c422f61ef94b88de16c911956734634cc47c4f5031b3d
+DIST linux-5.9.4.tar.sign 987 BLAKE2B 
ef16d6d1adabac9de4126e125c015cdde190585e338cda2ad9f51dc91c3efe3cef80545c9b2a8f9157ad73ac447d53d48937df6170a62e51db71b48684eb694b
 SHA512 
8b796fcf8cf751ff5d97062b9d12f5750e516e766b1d22d74d2c7c08d7bc02b3d292eb4f81797e76e684f473f9fc13c9b42ee7fda0615a0613d4800aade3c044
+DIST linux-5.9.4.tar.xz 115517728 BLAKE2B 
5c1e15c5a31cc80be69f9904fcc2a1ac0eb0d4d75095047698cb2ecf196efc7528efe6be91b6670b27a25eae1ee2065493c4e25ccd7537d73571975b83856c0a
 SHA512 
911e9b437df70f9c092e14f7daf22a62026f6aaadfcb599d27c88aaf8bbedc87cc917cff5a84c3ea3dca9f9a9e094a4228ed4480131bfa8adcf895f77518358b

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.4.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.4.ebuild
new file mode 100644
index 00000000000..63c2f94bed0
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.4.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.9.2
+CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
+
+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
+       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 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+       arm? ( savedconfig )"
+
+RDEPEND="
+       !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+       debug? ( dev-util/dwarves )
+       verify-sig? ( app-crypt/openpgp-keys-kernel )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+pkg_pretend() {
+       ewarn "Starting with 5.7.9, Distribution Kernels are switching from 
Arch"
+       ewarn "Linux configs to Fedora.  Please keep a backup kernel just in 
case."
+
+       kernel-install_pkg_pretend
+}
+
+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"
+       else
+               default
+       fi
+}
+
+src_prepare() {
+       default
+
+       # 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
+                       ;;
+               ppc64)
+                       cp 
"${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       local config_tweaks=(
+               # replace (none) with gentoo
+               -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+               # we do support x32
+               -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+               # disable signatures
+               -e '/CONFIG_MODULE_SIG/d'
+               -e '/CONFIG_SECURITY_LOCKDOWN/d'
+               -e '/CONFIG_KEXEC_SIG/d'
+               -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
+               -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
+               -e '/CONFIG_SIGNATURE/d'
+               # remove massive array of LSMs
+               -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
+               -e 
's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
+               # nobody actually wants fips
+               -e '/CONFIG_CRYPTO_FIPS/d'
+               # these tests are really not necessary
+               -e 
's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
+               # probably not needed by anybody but developers
+               -e '/CONFIG_CRYPTO_STATS/d'
+               # 1000hz is excessive for laptops
+               -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
+               # nobody is using this kernel on insane super computers
+               -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
+               # we're not actually producing live patches for folks
+               -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
+               # this slows down networking in general
+               -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
+               # include font for normal and hidpi screens
+               -e 
's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
+               # we don't need to actually install system headers from this 
ebuild
+               -e '/CONFIG_HEADERS_INSTALL/d'
+               # enable /proc/config.gz, used by linux-info.eclass
+               -e 
'/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
+       )
+       use debug || config_tweaks+=(
+               -e '/CONFIG_DEBUG_INFO/d'
+               -e '/CONFIG_DEBUG_RODATA_TEST/d'
+               -e '/CONFIG_DEBUG_VM/d'
+               -e '/CONFIG_DEBUG_SHIRQ/d'
+               -e '/CONFIG_DEBUG_LIST/d'
+               -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
+               -e '/CONFIG_TORTURE_TEST/d'
+               -e '/CONFIG_BOOTTIME_TRACING/d'
+               -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
+               -e '/CONFIG_X86_DECODER_SELFTEST/d'
+               -e '/CONFIG_KGDB/d'
+       )
+       sed -i "${config_tweaks[@]}" .config || die
+}

Reply via email to