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/vanilla-kernel/
Date: Wed, 30 Dec 2020 19:41:11
Message-Id: 1609357256.be9ae1eb10a94c6910ebf37a4b1ad69849c17767.mgorny@gentoo
1 commit: be9ae1eb10a94c6910ebf37a4b1ad69849c17767
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 30 17:18:48 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 30 19:40:56 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be9ae1eb
7
8 sys-kernel/vanilla-kernel: Bump to 5.4.86
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/vanilla-kernel/Manifest | 2 +
13 .../vanilla-kernel/vanilla-kernel-5.4.86.ebuild | 104 +++++++++++++++++++++
14 2 files changed, 106 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index 7f095f0fc81..0e9af5394e1 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -30,6 +30,8 @@ DIST linux-5.4.84.tar.sign 989 BLAKE2B 81b7f2ffd2504754c2e79acabb3eef38f764d8404
21 DIST linux-5.4.84.tar.xz 109631524 BLAKE2B b6cfb1c9b6b635cc3229c8780fa35ab48a6cde757f45b49ae5879cf41b5331cd8ff0913157c4d6efbe072ee4317732db36f74ea6a1333f118076a10b96ba74c8 SHA512 ac077a52ea7e1de51858938e66df61677e5049ef66ded82ed613528bec982a2891756f9474f3f82e8c5ac0dd4e90f691d4c04abffd092fe28bdb1fa7c0957dba
22 DIST linux-5.4.85.tar.sign 989 BLAKE2B 90ecac8f32d7c22af508b3233768065cc4626b6702d745fcc29f7063402dd5132c6c25e986c6465a4e4d0ddf27013d08736b2b51d2cce975aa919c745865d466 SHA512 a02d4ad9987c40436cda720e781f8bd0a41341564fe907e6618b8ed5149e9d2fa026f2b99cbee24d3d5862452ef140f3eba8f63f316900392726ac14d552ee29
23 DIST linux-5.4.85.tar.xz 109636476 BLAKE2B adc66aa3a2a901ed4d7450cc46efe4cef48536e03d19519b9f3f7015930489a9499b60ab8b66624bb54cf5c25aee0d3c39023c979615c0adf3edb5c89f5d595b SHA512 a1b188952ba81d9c4a19442035f9595292b443632fc17b1d976d2de11626287bdb75db1f50858c6224cff8665e3501619799c199c19b32283e7b6ea5683fd1a5
24 +DIST linux-5.4.86.tar.sign 989 BLAKE2B 03cd85aecb55488abcd7c09ce0f2d4a83e99267fe9ee1e36aaf66e4ea947275e373ac1f3e95f11049da58f760cc38ec240ee777aadc825f75aabce3645f00022 SHA512 b65b4a2ea90c2e907b247254dd73529e4098158ed29d9b31dba9c1d4a0e14f2e9b36c9e4870e764e0bc7bd0c884c40e9f420fbf43aedd75f21794cfca04b705e
25 +DIST linux-5.4.86.tar.xz 109648392 BLAKE2B 6c46810bce8902794849dfbab686b9c63ceea726d0a58351901d67c50370ed75d325095c0f426706c664f81a315621adae2f7080752e40e5a29b67ea67626005 SHA512 3cb6d81434ed7c340f67530f1bc9cadff81a916ecccc421833e3c70de0c72d1b3790c0ccae228a0ead591b2ccf1abf7fec0299565590e7f08889b509af141952
26 DIST linux-5.9.14.tar.sign 989 BLAKE2B e6a8d55aeb77ef73af969db44800d893715df0fb775655a2cde1158e8089ff0601eeb91ca30386c9d903c3954ad924142ca00cd299e04e0a721fd95a6140b30d SHA512 be1193c53f641749ee12508c8239af645746638df77f6ac30480248b472623b901d1fffb0058a531fb87e383ee9065d863ba1f3b92295ee205a0cb92817555f3
27 DIST linux-5.9.14.tar.xz 115556784 BLAKE2B 559dafc7d4f618ed6b00f0dce74b031c747d4435db5ac976a4b42f3e0c0c22da3ca7b38c77a44341221555adcb5612367b527bca70188c0903efce79fc4773c7 SHA512 719c32e811602cd3a9429c16c1c1e8684751dffd2fb052357376695a2654ec3f771e321e530ed178223dc581f36fbfa9be362941cf6fd74d2853b393ab357552
28 DIST linux-5.9.15.tar.sign 989 BLAKE2B 0881539488ebb253b09e63b86e2628cd435d090486b4ac477ee54e4d9b81f5171aecc4fd276ef629a35326bde95eec9d345053ef3951eae6fbdc542076f5a8a5 SHA512 cabf54dcdc2a4b8a8762b8d211921bd2137f38ca525a6efb42f2ae21fd754f095bee93720734d5fe4401c45d3a0f00fed25e826719ad1021835b00d386c75511
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.86.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.86.ebuild
31 new file mode 100644
32 index 00000000000..7f4ea086125
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.86.ebuild
35 @@ -0,0 +1,104 @@
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 verify-sig
42 +
43 +MY_P=linux-${PV}
44 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
45 +CONFIG_VER=5.4.21
46 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
47 +GENTOO_CONFIG_VER=5.4.77-r1
48 +
49 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
50 +HOMEPAGE="https://www.kernel.org/"
51 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
52 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
53 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
54 + verify-sig? (
55 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
56 + )
57 + amd64? (
58 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
59 + -> kernel-x86_64.config.${CONFIG_VER}
60 + )
61 + arm64? (
62 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
63 + -> kernel-aarch64.config.${CONFIG_VER}
64 + )
65 + ppc64? (
66 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
67 + -> kernel-ppc64le.config.${CONFIG_VER}
68 + )
69 + x86? (
70 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
71 + -> kernel-i686.config.${CONFIG_VER}
72 + )"
73 +S=${WORKDIR}/${MY_P}
74 +
75 +LICENSE="GPL-2"
76 +KEYWORDS="~amd64 ~arm64 ~x86"
77 +IUSE="debug"
78 +
79 +RDEPEND="
80 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
81 +BDEPEND="
82 + debug? ( dev-util/dwarves )
83 + verify-sig? ( app-crypt/openpgp-keys-kernel )"
84 +
85 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
86 +
87 +pkg_pretend() {
88 + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
89 + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
90 +
91 + kernel-install_pkg_pretend
92 +}
93 +
94 +src_unpack() {
95 + if use verify-sig; then
96 + einfo "Unpacking linux-${PV}.tar.xz ..."
97 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
98 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
99 + assert "Unpack failed"
100 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
101 + else
102 + default
103 + fi
104 +}
105 +
106 +src_prepare() {
107 + default
108 +
109 + # prepare the default config
110 + case ${ARCH} in
111 + amd64)
112 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
113 + ;;
114 + arm64)
115 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
116 + ;;
117 + ppc64)
118 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
119 + ;;
120 + x86)
121 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
122 + ;;
123 + *)
124 + die "Unsupported arch ${ARCH}"
125 + ;;
126 + esac
127 +
128 + local merge_configs=(
129 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
130 + )
131 + use debug || merge_configs+=(
132 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
133 + )
134 + [[ ${ARCH} == x86 ]] && merge_configs+=(
135 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
136 + )
137 +
138 + kernel-build_merge_configs "${merge_configs[@]}"
139 +}