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: Mon, 28 Mar 2022 15:52:27
Message-Id: 1648482733.2a54335bde51d938763cc127b2e13259798caaa9.mgorny@gentoo
1 commit: 2a54335bde51d938763cc127b2e13259798caaa9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 28 12:30:13 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 28 15:52:13 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a54335b
7
8 sys-kernel/vanilla-kernel: Bump to 5.4.188
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.188.ebuild | 108 +++++++++++++++++++++
14 2 files changed, 110 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index 6470a3ecad81..d132f6463074 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -45,3 +45,5 @@ DIST linux-5.4.186.tar.sign 991 BLAKE2B 6272e71e1e9b34590c73eeabdba16f1224405617
21 DIST linux-5.4.186.tar.xz 112884120 BLAKE2B 30b48c13ef072dbc8a5886a23450212a436aec236bf7c01cd119fe7d6f12f31d3b1296930aaac641a7545d2d1b925bb571d483c85718b4a537b828d39d29932b SHA512 cebe4a5b2b45c77b96bda61f04db563fd9fded503eb057db748329b39c541ff8ca9d49f6a04d40c413b0cdf9917a666d5cabeb4011760229aad794f41c300543
22 DIST linux-5.4.187.tar.sign 991 BLAKE2B ebb5039e2bb4a2a570bcabddcc0457195c1d3b459b76d92be310e9763905dc3e37d7832ef42f7a1b60325ef1947dbead6c58371f970d2fea1fe9e07e0299036b SHA512 d191391a4af6bba8fb54db0e97648dbac7035cafc3f091f2afb290f2205e1c8eebfd19a407c7cbfc667199a5c5697272d2dbfdd59f5366e7482cc539e4c8ab6f
23 DIST linux-5.4.187.tar.xz 112896008 BLAKE2B 0f3afac5695185fee529660a4c3982efb02ab29963927aebfc6098fb38970c0030f8302a65b8786a8ef91fb182d2a2a6dd6e084ca7c958dd21d38c36a10b79d7 SHA512 8cc9fb9d2ef1fe4036620f66c247c8b53b851c752822af1fa1bfe4dae51c7dbbe84b28443d624b4aa40197392f998e01e0f766d28301af4c2e3d13aa396e0b64
24 +DIST linux-5.4.188.tar.sign 991 BLAKE2B 544964d936af5ac8f877b2fd9fd3e858e1ea7bd82880ffed88493cc737a914285cfab6ec58019e42fbab3997b19148f4ec0925872179cecc1b7be62a02de6a04 SHA512 01fe913ef0da173dade0e0858f8032b01376223b1d99d381fc7118b38ed70cfba93435b97ce3e41f45159e952dd31db3a0bd67cdd32117379fd8847b236f05b2
25 +DIST linux-5.4.188.tar.xz 112915792 BLAKE2B a2ea3b6c84edc952b8691903243464489b57284d8e7b49ff8d99d8790adadd1489d2d36ce36e4f357118ae5a61effc9f13eccfb97070ea99c8bec72344066aa1 SHA512 fc3cdac63f2add05662561388197380622f5da24d4683d8985e942d04a8f898f38a9dc53b2b045d32f2070494322d7570ffaf4a071a311bc99ea018d81d2ec88
26
27 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.188.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.188.ebuild
28 new file mode 100644
29 index 000000000000..4f5f7870ccb8
30 --- /dev/null
31 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.188.ebuild
32 @@ -0,0 +1,108 @@
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=g1
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/${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 +"
72 +S=${WORKDIR}/${MY_P}
73 +
74 +LICENSE="GPL-2"
75 +KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
76 +IUSE="debug"
77 +
78 +BDEPEND="
79 + debug? ( dev-util/pahole )
80 + verify-sig? ( sec-keys/openpgp-keys-kernel )
81 +"
82 +PDEPEND="
83 + >=virtual/dist-kernel-${PV}
84 +"
85 +
86 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
87 +
88 +src_unpack() {
89 + if use verify-sig; then
90 + einfo "Unpacking linux-${PV}.tar.xz ..."
91 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
92 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
93 + assert "Unpack failed"
94 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
95 + else
96 + default
97 + fi
98 +}
99 +
100 +src_prepare() {
101 + default
102 +
103 + # prepare the default config
104 + case ${ARCH} in
105 + amd64)
106 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
107 + ;;
108 + arm64)
109 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
110 + ;;
111 + ppc)
112 + # assume powermac/powerbook defconfig
113 + # we still package.use.force savedconfig
114 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
115 + ;;
116 + ppc64)
117 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
118 + ;;
119 + x86)
120 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
121 + ;;
122 + *)
123 + die "Unsupported arch ${ARCH}"
124 + ;;
125 + esac
126 +
127 + echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
128 + local merge_configs=(
129 + "${T}"/version.config
130 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
131 + )
132 + use debug || merge_configs+=(
133 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
134 + )
135 + [[ ${ARCH} == x86 ]] && merge_configs+=(
136 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
137 + )
138 +
139 + kernel-build_merge_configs "${merge_configs[@]}"
140 +}