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, 08 Feb 2022 23:21:53
Message-Id: 1644362489.3dcf0ff25dcedcbf30ff6d33c0acba29b0f27084.mgorny@gentoo
1 commit: 3dcf0ff25dcedcbf30ff6d33c0acba29b0f27084
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 8 19:22:02 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 8 23:21:29 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dcf0ff2
7
8 sys-kernel/vanilla-kernel: Bump to 5.15.22
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.15.22.ebuild | 130 +++++++++++++++++++++
14 2 files changed, 132 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index f5fa57b35c68..fe2071b7461e 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -28,6 +28,8 @@ DIST linux-5.15.20.tar.sign 991 BLAKE2B 0d0f2a8a97a991af1623a1e3e49fec2974b9b584
21 DIST linux-5.15.20.tar.xz 126200868 BLAKE2B aa1fce6c09c4db0be4540bc15d2bc799e62047621ffb9f40ff709fdbab6c4ae983bb0a47e1a7720fd395b28d5d467febfedea050ff243f39b08399f86571d02f SHA512 49890763271ead7e9bd3501a320f3dfae2e0af2e07e74fced08757e9de72c1a8f374f58c9c92517b4fa523b8a81c7a5de5bb529a11c4e0ecb3122128ae3bd627
22 DIST linux-5.15.21.tar.sign 991 BLAKE2B 2d2bbd5b687f97c2b5ccdd05cd4aca339f532a32238ecb72744395f257c0fd9758b4265ccbf347ff291598cf4844074ebed2f23d29f25ab5b2f3f45141ed7747 SHA512 374826a06f73cc913b2621a099a58130242b74ff173dcdabaaaa320ff767a17cfc43abb19a4e607723c7473df4489af1071ec903f5fcd7fd8974e808dc0e48c3
23 DIST linux-5.15.21.tar.xz 126222040 BLAKE2B 9180dd81099429e55a037986481ae9c3bbce450070cfef083946771347de829ad4fc63fd83512bac3bd33ea4d0eb765a7d4afae7111467dc425cda3bbb9c5303 SHA512 8a1d126f6ea7a8cded502b3dd8bdb54b0d26f3ca7a38b8134cb05118306323d530ba8a738a7fef03f72708c875a79989e6de7089530c93c2a9caf4b662568813
24 +DIST linux-5.15.22.tar.sign 991 BLAKE2B e961955e26ddd07104d467ed419e696f16503eaa0199a4fe55f452ea35aab9a645d9bff8dc54a5e25f6de41663b5c05caf08a1a372a740cb4a719ba078773349 SHA512 0ee9194a22958b79ab31895fc5f1d198c525cb50118476fdaef7b83725be3de91cb946a04b4e29bb5c0e4d1684b205b99f0efa105a1f1d92292581f48ed4aaf7
25 +DIST linux-5.15.22.tar.xz 126216740 BLAKE2B 86896b1d0e2c5c489fbf2bd2c070fd58492c8ddf0841f7939bd8db94215616ac1236fd3ffefb9791134c90f7391f1d12a394725a488f4241b147f90d7ac4b40b SHA512 c2740770cf27e8b8be660c23700ba68e783da4ee4ac0b7ea4f0aeefd292a53c83904554f376f5b43648423372c3bca1ecac2bf992260f9cfc6a1bb6673fcd9bc
26 DIST linux-5.16.5.tar.sign 989 BLAKE2B a55d8da745785fb479519fd9daf745bae4be54e2b8c135b9f51af38035b273de86bc54dbb7598f98d3bebad995889a779bd88f9d65b2ade44d9bc995ba5ab2a6 SHA512 414f71b299c7624604d1e4b5cc894c888cefded016249d2cefda54727e043152a6abf1a62daccd4934348965c4a574ecad6b098d38774b114098a6d74d9f6921
27 DIST linux-5.16.5.tar.xz 127552076 BLAKE2B 9eccc20c59a93aa21349ce99b88638de8bb0589037e91143d23932cb5312878bac7ae95adfd0f95b79ad0085f74109577427675320e4a2548f8762661dcdc8e4 SHA512 bb87573623a275a8860728e9586f0e63aba7bd868de55ce27871f615e9b174aeb18c3faefc41e3d656bc998768fa3e3c6097e9d39c32fea48d3769f46c48a2f2
28 DIST linux-5.16.6.tar.sign 989 BLAKE2B 49eab210f7029b8a24cbaec467cd5b1ead4b22a00d3132fcc619aa9c0ed126cbf3f763f8af49447a4a258d990a5a707880e2b5705b4310c066aaf41a54086384 SHA512 b1f241b097bb7678b06b361f35060c1d0846d5a3001b98238b7a81c3fa965b9eb8af13144bd6f4914fc47b16f2810ddc7b25c60605aeb99fa03a705f5c024b2e
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.22.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.22.ebuild
31 new file mode 100644
32 index 000000000000..3b10562055bd
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.22.ebuild
35 @@ -0,0 +1,130 @@
36 +# Copyright 2020-2022 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +
41 +inherit kernel-build toolchain-funcs verify-sig
42 +
43 +MY_P=linux-${PV}
44 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
45 +CONFIG_VER=5.15.14
46 +CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f
47 +GENTOO_CONFIG_VER=5.15.5
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-fedora.config
59 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
60 + )
61 + arm64? (
62 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
63 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
64 + )
65 + ppc64? (
66 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
67 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
68 + )
69 + x86? (
70 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
71 + -> kernel-i686-fedora.config.${CONFIG_VER}
72 + )"
73 +S=${WORKDIR}/${MY_P}
74 +
75 +LICENSE="GPL-2"
76 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
77 +IUSE="debug hardened"
78 +REQUIRED_USE="arm? ( savedconfig )"
79 +
80 +BDEPEND="
81 + debug? ( dev-util/pahole )
82 + verify-sig? ( sec-keys/openpgp-keys-kernel )"
83 +PDEPEND="
84 + >=virtual/dist-kernel-${PV}"
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 + local biendian=false
104 +
105 + # prepare the default config
106 + case ${ARCH} in
107 + amd64)
108 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
109 + ;;
110 + arm)
111 + return
112 + ;;
113 + arm64)
114 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
115 + biendian=true
116 + ;;
117 + hppa)
118 + return
119 + ;;
120 + ppc)
121 + # assume powermac/powerbook defconfig
122 + # we still package.use.force savedconfig
123 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
124 + ;;
125 + ppc64)
126 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
127 + biendian=true
128 + ;;
129 + x86)
130 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
131 + ;;
132 + *)
133 + die "Unsupported arch ${ARCH}"
134 + ;;
135 + esac
136 +
137 + local myversion="-dist"
138 + use hardened && myversion+="-hardened"
139 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
140 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
141 +
142 + local merge_configs=(
143 + "${T}"/version.config
144 + "${dist_conf_path}"/base.config
145 + )
146 + use debug || merge_configs+=(
147 + "${dist_conf_path}"/no-debug.config
148 + )
149 + if use hardened; then
150 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
151 +
152 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
153 +
154 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
155 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
156 + fi
157 + fi
158 +
159 + # this covers ppc64 and aarch64_be only for now
160 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
161 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
162 + fi
163 +
164 + kernel-build_merge_configs "${merge_configs[@]}"
165 +}