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: Tue, 11 Jan 2022 20:52:14
Message-Id: 1641934278.5c03e4462ee823a5ebd9ce27518d61bf98cb6c33.mgorny@gentoo
1 commit: 5c03e4462ee823a5ebd9ce27518d61bf98cb6c33
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 11 17:23:06 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 11 20:51:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c03e446
7
8 sys-kernel/vanilla-kernel: Bump to 5.4.171
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.171.ebuild | 107 +++++++++++++++++++++
14 2 files changed, 109 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index a2ecfa9fc100..d5ffab29151d 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -45,3 +45,5 @@ DIST linux-5.4.169.tar.sign 991 BLAKE2B 9f1deaf031eec59ff36d5cf72b9154cda6fa9f4c
21 DIST linux-5.4.169.tar.xz 109192960 BLAKE2B 136c792f554832e6e52340ce935bf2f1b2b09c8bb8fab6889920b68bf27134e2d53f0228ec8ac31233a4b2a5b7faed87238d1c7d509ddd8c649ab8275a860e23 SHA512 43ba0a51c12e4366e0793217ce66dfefc13b83f0ab8a575a21058909e03f161410bff2aae272c64c5873779886d24d3fd0cc82655de5b20b428eca6cf681685e
22 DIST linux-5.4.170.tar.sign 991 BLAKE2B 225477d94c3645baa345a528c341f8e4ce4c1326d4901fc6e7d6919890f18ac750597b9e20908322b96419cc894613d96e2e9f0a99fcd288f91bdd8a640e212f SHA512 b61adc39a65c6643537b47dc6de6adfb24db6406ad14c982aa2a9beaaa0d2a705c1d22eb31ad16eb9ce093a52fdddc3667c5342fc41056817e6c15138af274eb
23 DIST linux-5.4.170.tar.xz 109202572 BLAKE2B 92c93457dd5cbacd2522ef71f3f5ad1ac97521ec46966ed8f46fd9ffbeaa986bd9c0ceaa96187e1b0beb76daef98ea0af1e49c2b7e92759fc7ffdf5a90204aba SHA512 aa2a36067f9015b63254e098522053993de4b31dbbf39050adbe4cec3b7e4249152ad5e154a9bf3ca2b2f60c4db274e8f4ed9df9c66d8a392653dd5de79554f8
24 +DIST linux-5.4.171.tar.sign 991 BLAKE2B 3ec7e90e82689fbccb4f3faf8e50d2cb00af2227ab9af1942029d630e0f2a1191595a203d6b6a2d982d5a2d5b2a8c4f65ed87a31918df143255f4b1be5635d50 SHA512 1e78c9a05f4ee3317324c71563030132138284a7cd5aa0156e65b1fd8ec783a3d35a68129a3dc956c51ff464a1b5b38d363eaa08a36d505114dc4a04574ed3e8
25 +DIST linux-5.4.171.tar.xz 107901796 BLAKE2B 1c47d9dae77d40ec6eabcc8d64e73537b6100a6f6b1d85b67022d6a223170722a1ae856fcf65665341b33d7d8b9228b88425e48d92110bc107f4657f37e4b74c SHA512 a9819c35cb92de25303c254b3e63cce16b58282dad06bde57b20bb70691fa255cc303c22c8718e95db73772b39bde5a9ba880133732879d03afa358042acd0d9
26
27 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.171.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.171.ebuild
28 new file mode 100644
29 index 000000000000..a68d501c5130
30 --- /dev/null
31 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.171.ebuild
32 @@ -0,0 +1,107 @@
33 +# Copyright 2020-2022 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +inherit kernel-build verify-sig
39 +
40 +MY_P=linux-${PV}
41 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
42 +CONFIG_VER=5.4.21
43 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
44 +GENTOO_CONFIG_VER=5.4.114
45 +
46 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
47 +HOMEPAGE="https://www.kernel.org/"
48 +SRC_URI+="
49 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
50 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
51 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
52 + verify-sig? (
53 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
54 + )
55 + amd64? (
56 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
57 + -> kernel-x86_64.config.${CONFIG_VER}
58 + )
59 + arm64? (
60 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
61 + -> kernel-aarch64.config.${CONFIG_VER}
62 + )
63 + ppc64? (
64 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
65 + -> kernel-ppc64le.config.${CONFIG_VER}
66 + )
67 + x86? (
68 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
69 + -> kernel-i686.config.${CONFIG_VER}
70 + )"
71 +S=${WORKDIR}/${MY_P}
72 +
73 +LICENSE="GPL-2"
74 +KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
75 +IUSE="debug"
76 +
77 +RDEPEND="
78 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
79 +BDEPEND="
80 + debug? ( dev-util/pahole )
81 + verify-sig? ( sec-keys/openpgp-keys-kernel )"
82 +PDEPEND="
83 + >=virtual/dist-kernel-${PV}"
84 +
85 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
86 +
87 +src_unpack() {
88 + if use verify-sig; then
89 + einfo "Unpacking linux-${PV}.tar.xz ..."
90 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
91 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
92 + assert "Unpack failed"
93 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
94 + else
95 + default
96 + fi
97 +}
98 +
99 +src_prepare() {
100 + default
101 +
102 + # prepare the default config
103 + case ${ARCH} in
104 + amd64)
105 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
106 + ;;
107 + arm64)
108 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
109 + ;;
110 + ppc)
111 + # assume powermac/powerbook defconfig
112 + # we still package.use.force savedconfig
113 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
114 + ;;
115 + ppc64)
116 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
117 + ;;
118 + x86)
119 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
120 + ;;
121 + *)
122 + die "Unsupported arch ${ARCH}"
123 + ;;
124 + esac
125 +
126 + echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
127 + local merge_configs=(
128 + "${T}"/version.config
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 +}