Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/
Date: Sat, 15 Feb 2020 16:11:48
Message-Id: 1581783092.e1b62627ee1bd5611c276537371bc1c07a4118f1.mgorny@gentoo
1 commit: e1b62627ee1bd5611c276537371bc1c07a4118f1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 15 04:37:14 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 15 16:11:32 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b62627
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.20
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/gentoo-kernel/Manifest | 2 +
13 .../gentoo-kernel/gentoo-kernel-5.4.20.ebuild | 73 ++++++++++++++++++++++
14 2 files changed, 75 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index f67de2cc725..c3efe70b93e 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -6,6 +6,8 @@ DIST genpatches-4.19-99.base.tar.xz 2980172 BLAKE2B 2da82ccc1a3a9f874f30046c4d7e
21 DIST genpatches-4.19-99.extras.tar.xz 17488 BLAKE2B d57f278109d3ea0cbe324e15666f119e2a9ef4ebfe6f9581dffdd6e9f4c11fca47dc08f2375da62928076647352772cedad41a8ab97b312b59a03956dd4a3954 SHA512 ae1f8f8fd8f9da3860e82d8838714248983014257386bab802ec3adf86d694db50db8d6cc9a9d01a2a6936e2ceb740a4f4732e48b1c40eebc8ffd523745d5dca
22 DIST genpatches-5.4-19.base.tar.xz 782808 BLAKE2B 9b0b3e6090e33f5852c3fdd2ee58110f909beea9aac3c2591709fe97ba24003b9c923085f1577309052f94a934dc36be0937ded1df05828b69ddbc6ae31c158c SHA512 866aa0b06f8198739cabd54fcf09308629d00139f9068c255cdf61d96bb0288a5dfea7a46562ed51cfad2e682c29195e0304c442d659f50238cdc38e9e885fbb
23 DIST genpatches-5.4-19.extras.tar.xz 1740 BLAKE2B 85acc37c0b0087ca198bb168a18b764e0b2061c9d41bb1902308c517b1760031258cd7221725b7fa3145fc7b802b8bd8bb10c241ac5ddb6f1b4436ae92d4c783 SHA512 59701650a902e708c98d9e6ef3c5528be0831d8ead28ef2d46f1c4cdb386336ad36a137a4d77d0193c7acc10b1448dc54a18dc4177365d56069c7c3fb5143ae2
24 +DIST genpatches-5.4-20.base.tar.xz 807268 BLAKE2B e5930087b8384c74c699414d1396278e25f8c2c208675976d5b46f8b34cb22a5f02f6fc88d7c3630796628122e5774e245ffbfe2542b3fd99527c1f391ef8648 SHA512 087e244b8dc00117ec9d4773549479538b0d65598f204da337e37425e76d0b42330a227a06d49e7f49997f3929fb5a4c9ff8faca65aa12c358093fe5556aff52
25 +DIST genpatches-5.4-20.extras.tar.xz 1744 BLAKE2B ca42cfee9974f2c2ae029d3041fb510d206721e52615c705f0c586aca0e91bb469d24a35d93f156f5b3c6077b9e6cf3dc50e361124310bc4321eeb20cd4e08e2 SHA512 980534074d620aa6e9eb9d8cd9c6ee64d9398dd210c6d3b14359af96da441cfee576212aafe4777b914f9e9ee6e9468f628570d42bfebe7967c8fb72a6568ead
26 DIST genpatches-5.5-5.base.tar.xz 169776 BLAKE2B 781e5e23d69eac115dcf243bcb8a33b6793f1e53f303c634e80b32e6507a4d13f83ddf75b191dda159f4f55e4d00cc8cb1cd131039f6c5411e775c670f0f1ae5 SHA512 f177546e168274c4f814e50839f8f797f45eeed6690868131a0fb2a9b450051cd62ebe32c2118ac6e719be0daca5bafcf44696f69b0c5d5e23490ac5ac1dd362
27 DIST genpatches-5.5-5.extras.tar.xz 1744 BLAKE2B 0e040d013f97c2406cc5d0905fcdff3fe25f886ccc6d8622d7d76feb9f0fc7bb5fe6729a773a0bd5de3bb6b8654df38134ec8e44b0e72ee7c0230f8503efd802 SHA512 ae5e540a56d31a1e1eb21b69bf3fe229bcd402829e068bb2398e585579652254e84da2ffc11c7cbd146aa619dd047a7b472b05234e008288293bf7bc2b7c1761
28 DIST linux-4.19.85-arch1.i686.config 222183 BLAKE2B 03eac77940db0ee6b4f2a006edc600ef34141bbca849f5be4de9b961301a8fc987da6d0e21344aa5d80c29bb7793d56cf5441abb6c8e4057d94e2601c174c1be SHA512 6bd45c9dfd96b1afb8c1ca1ca72722baee6c91894e454d7af937de02242d3bb9d3b6870f5976aa96245c753c6bc1ac637a6356125b0d4c596aadef643b8c3d8d
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.20.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.20.ebuild
31 new file mode 100644
32 index 00000000000..0041d89b83f
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.20.ebuild
35 @@ -0,0 +1,73 @@
36 +# Copyright 2020 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +
41 +inherit kernel-build
42 +
43 +MY_P=linux-${PV%.*}
44 +GENPATCHES_P=genpatches-${PV%.*}-${PV##*.}
45 +# https://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux
46 +AMD64_CONFIG_VER=5.4.13.arch1
47 +AMD64_CONFIG_HASH=9eed969590614a38d370a9fe04a4f5d38ba5e06e
48 +# https://git.archlinux32.org/packages/log/core/linux/config.i686
49 +I686_CONFIG_VER=5.4.13-arch1
50 +I686_CONFIG_HASH=95f890a9f9131e7a0e01a4f3e9c5ee423756a233
51 +
52 +DESCRIPTION="Linux kernel built with Gentoo patches"
53 +HOMEPAGE="https://www.kernel.org/"
54 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
55 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
56 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
57 + amd64? (
58 + https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=${AMD64_CONFIG_HASH}
59 + -> linux-${AMD64_CONFIG_VER}.amd64.config
60 + )
61 + x86? (
62 + https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=${I686_CONFIG_HASH}
63 + -> linux-${I686_CONFIG_VER}.i686.config
64 + )"
65 +S=${WORKDIR}/${MY_P}
66 +
67 +LICENSE="GPL-2"
68 +KEYWORDS="~amd64 ~x86"
69 +
70 +RDEPEND="
71 + !sys-kernel/vanilla-kernel:${SLOT}
72 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
73 +
74 +src_prepare() {
75 + local PATCHES=(
76 + # meh, genpatches have no directory
77 + "${WORKDIR}"/*.patch
78 + )
79 + default
80 +
81 + # prepare the default config
82 + case ${ARCH} in
83 + amd64)
84 + cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
85 + ;;
86 + x86)
87 + cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
88 + ;;
89 + *)
90 + die "Unsupported arch ${ARCH}"
91 + ;;
92 + esac
93 +
94 + local config_tweaks=(
95 + # shove arch under the carpet!
96 + -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
97 + # we do support x32
98 + -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
99 + # disable signatures
100 + -e '/CONFIG_MODULE_SIG/d'
101 + -e '/CONFIG_SECURITY_LOCKDOWN/d'
102 + # disable compression to allow stripping
103 + -e '/CONFIG_MODULE_COMPRESS/d'
104 + # disable gcc plugins to unbreak distcc
105 + -e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
106 + )
107 + sed -i "${config_tweaks[@]}" .config || die
108 +}