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: Thu, 06 Jan 2022 00:13:01
Message-Id: 1641427962.e42d258492a7a1dc1398bbe2f383e031afcb955c.mgorny@gentoo
1 commit: e42d258492a7a1dc1398bbe2f383e031afcb955c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 5 19:35:32 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 6 00:12:42 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e42d2584
7
8 sys-kernel/vanilla-kernel: Bump to 5.15.13
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.13.ebuild | 129 +++++++++++++++++++++
14 2 files changed, 131 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index f9b3103c4ae2..c51424c92fb9 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -27,6 +27,8 @@ DIST linux-5.15.11.tar.sign 991 BLAKE2B 42bed55a97098e8af2c9f33852b94806710e2df1
21 DIST linux-5.15.11.tar.xz 121955784 BLAKE2B 37a264e50069e5b195b99a355944893e42c6fc05eb5fef7907855de4d31c693421e6fc578575ed141534b52ab9105dfd7697bdfec238cfa88e16a6c41f138ebd SHA512 5abe52981a9f493174afb908bc1c1a4901bc522c38c2da7ba15d5b907f06f9c4a684a47436697d79df8f598e166064d46add5661632a48275e0268411563f6b2
22 DIST linux-5.15.12.tar.sign 991 BLAKE2B 2eabe426cd804a5515a2fb2d65c763322d313ba81432ea2dc931172d592073735dac74615828dbf2b07d5fa66a562606cbe03f697578444c95c5b78cddca1910 SHA512 267a8f1b5813dc9c0c24b534de9890e398656bb4cf96294f3934c88297eaa36a773d9d89ef41c19ac411ef86aad9ebe463de0f9fef1c1b5df8b372852b64c526
23 DIST linux-5.15.12.tar.xz 121949156 BLAKE2B 6e201ffe5832a998b9bc8f63e9fcbf7f0384d4e4abb1a68c2299b8362b51ddcfbc35639bfc836a84202bec3705f5bca1616396c16daa05d778659d286f63b6a8 SHA512 8b79f30c26a865578d771b0c1a8273ecbf19135e4844210cb31c81784311601b8f7adfe1b3a9bc75c6bed99dcad9a5ff5e1976494b64f0de45be3a6570336890
24 +DIST linux-5.15.13.tar.sign 991 BLAKE2B bc12b1eea7a7ba1bbd135165b320c4cf775bcbd1ea6d95ddeb1a55a1b43046c691b26b06b5232fcff39b0fa9ccd458d6f92380080050925d974b845bb66708a2 SHA512 beddeedbbe2a69f78bbb4f324bde11a64d8eafd50cdd8acdd35ff905cd1d1ae8b652f14adaf9dd104a1d17b608bcf18ce0b2685321c672160c75205cb7c54e25
25 +DIST linux-5.15.13.tar.xz 121958852 BLAKE2B ea8775ffb1e25107b62dfe7acac4e9098094f7e1cd9846566cdf9fc1f0a6e2520f27dc48ce85c29e91032eb21a6f6682f6698a91b02b9424f2d895b5c9b468ec SHA512 0775216f9a5f828b23bb8f96810ac65d178aeede0d1ee258a01b6f83f4a145809ab6699fa07aa07721e118cf0b608ee98885fe76be07b8707a2f9cd1c0833ae5
26 DIST linux-5.4.168.tar.sign 991 BLAKE2B a581b74de0296ef69cd10686381571aa3c2e73b59dd495e78a7ba168dff85f7af3a3b7719419b767fe0b8380a904248d624bd1e17712327d2ebd62335943f8dd SHA512 bdd0a88b6199d57b3c86521e58a356a35273007fb421e5d3b80d40e4b9337c30fa1b982dba61673fda0ddc9e3107b8da5cbe4916364fbbe035ab5026befe1c74
27 DIST linux-5.4.168.tar.xz 109188452 BLAKE2B 72e7da0a2a2d2ecef4b73b268db09a7cdb7a0e76cbbbfd7111ec727593f8eb60026ecd8102bedf9b13b393cfc9fdd4b5297ed4c48869152c09581d763e156552 SHA512 119856b47f2fb2d3560fedb60fc3dd432e5b150261c9d959e5e9426f7f6e03630fcade800b8e97fe6fc6edc717bc6a0a296c875c0dc771045b65d20b9df8a510
28 DIST linux-5.4.169.tar.sign 991 BLAKE2B 9f1deaf031eec59ff36d5cf72b9154cda6fa9f4c90f588e7f59d9b2b12990e30d329ccd4127b52a52aedbcad06373f907e0903f0bfd76be98c78f135dee78cda SHA512 0683df80944f76eb8b4101237371fffd310f329662e8464452637e2fd46a86ccb4498d0e7781055c425e6ff6590e582b7641e8277ea22ac4084ed5b591352c45
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.13.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.13.ebuild
31 new file mode 100644
32 index 000000000000..f7731de3f3a6
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.13.ebuild
35 @@ -0,0 +1,129 @@
36 +# Copyright 2020-2021 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.10
46 +CONFIG_HASH=4882b85cc85fb2b7df396c4d671cc6432596eca0
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 +RDEPEND="
81 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
82 +BDEPEND="
83 + debug? ( dev-util/pahole )
84 + verify-sig? ( sec-keys/openpgp-keys-kernel )"
85 +PDEPEND="
86 + >=virtual/dist-kernel-${PV}"
87 +
88 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
89 +
90 +src_unpack() {
91 + if use verify-sig; then
92 + einfo "Unpacking linux-${PV}.tar.xz ..."
93 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
94 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
95 + assert "Unpack failed"
96 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
97 + else
98 + default
99 + fi
100 +}
101 +
102 +src_prepare() {
103 + default
104 +
105 + local biendian=false
106 +
107 + # prepare the default config
108 + case ${ARCH} in
109 + amd64)
110 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
111 + ;;
112 + arm)
113 + return
114 + ;;
115 + arm64)
116 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
117 + biendian=true
118 + ;;
119 + ppc)
120 + # assume powermac/powerbook defconfig
121 + # we still package.use.force savedconfig
122 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
123 + ;;
124 + ppc64)
125 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
126 + biendian=true
127 + ;;
128 + x86)
129 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
130 + ;;
131 + *)
132 + die "Unsupported arch ${ARCH}"
133 + ;;
134 + esac
135 +
136 + local myversion="-dist"
137 + use hardened && myversion+="-hardened"
138 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
139 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
140 +
141 + local merge_configs=(
142 + "${T}"/version.config
143 + "${dist_conf_path}"/base.config
144 + )
145 + use debug || merge_configs+=(
146 + "${dist_conf_path}"/no-debug.config
147 + )
148 + if use hardened; then
149 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
150 +
151 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
152 +
153 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
154 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
155 + fi
156 + fi
157 +
158 + # this covers ppc64 and aarch64_be only for now
159 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
160 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
161 + fi
162 +
163 + kernel-build_merge_configs "${merge_configs[@]}"
164 +}