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: Sat, 29 Jan 2022 20:43:24
Message-Id: 1643488984.c544c2bb05dc8060b4e957aa316778cd1a346cfc.mgorny@gentoo
1 commit: c544c2bb05dc8060b4e957aa316778cd1a346cfc
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 29 19:34:03 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 29 20:43:04 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c544c2bb
7
8 sys-kernel/vanilla-kernel: Bump to 5.15.18
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.18.ebuild | 132 +++++++++++++++++++++
14 2 files changed, 134 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index c212166139d8..d23347752ce3 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -20,6 +20,8 @@ DIST linux-5.15.16.tar.sign 991 BLAKE2B 0523e495f73946be58c751189eeac9eeeff5eb98
21 DIST linux-5.15.16.tar.xz 126178716 BLAKE2B 73b2f6a135c89db2ffbba8d8271761df3b98e0c844821367a3e009d67a5df27d11f02265eae34229b699c7308d4cf505f0f4a751a8135b6a6f0bf46929cbb785 SHA512 a2e3dbd92b2079a64af4d4a17db998381b5afe41ffb8b6b7fb43a69eb93b1c6d766b4b8ebba287d45f3de8392e4808cca5a7ccd5da5d42f7f58a57bf17ce5d10
22 DIST linux-5.15.17.tar.sign 991 BLAKE2B fc33eb461f03a37408dc5fffa8360da639c0d6e30ecc60eb25879cf8988dd500a76b38e90b880311cfecae150b81491353dcc5da8241e5bbc4e212ab78ef46ca SHA512 e68799de99982a71c8ee92200606ae5072cf58c8980bdcf2637bc75bd612344fdd0c893ffedcdec650d1f3474eda4d8df3083ca27c16124d6d72ee5d00ca0288
23 DIST linux-5.15.17.tar.xz 126222044 BLAKE2B 32b9e59238ae10db425c53447a2499322b9879501fff9ed4ccbb678c17d5459e8de59696de46f751b4fc65737418a9792f52eb5f817275c88d0b9aca3ec1a6fd SHA512 ddd797a2931c80e2a2fe660e31a5b3ebc6bc5a4a8dc0220f175545016e9d9f3bf21be3b55c99a511b7391b5d91650ac5119483230fafcdac448a55b4b4d5f043
24 +DIST linux-5.15.18.tar.sign 991 BLAKE2B aca59944c1898d3e8267f776d3c2a748a8efeeee92a683a3324233681dcc0a3f379f68758b0aa1a82cde70761af097b3f352bd2a5cec7ad534f48cd6e92175dd SHA512 9b4d3b843829a0e5bc450bfae9ffa9eff281e323a14b52cdf8c0844e977a2dcdb85c99aa2771ca3b523740cc384ee7fa61e55d69d93c234f005a33aa66b8f84b
25 +DIST linux-5.15.18.tar.xz 126228144 BLAKE2B 94190ec4dc73c52b736a081a097453c29e1f1b86d6536a2a4393d8fd219da9b81f5667f3cc0e9eb2290de88ee1b14c7685ecdb162ee389a7dbf1c081a97abc9a SHA512 f3927c06ae1b603191fbb2153837c9b45cfbff291121df7e01af3c139116301af2d530ced01b1144b1ec3c317f156d996d98da84bb53069fd736e2c33ebd7678
26 DIST linux-5.4.173.tar.sign 991 BLAKE2B c4a1ea4cb4dc7e4654fd5b2405fb1fecfaa0421d778b056c5c9a64a37931e7019f25e7f27c50a74af90dc49f295c9ec63c589a4a80c27b0eccd2920b6ccb7867 SHA512 92f822a73d3f9e62dc5c79f97407ec127e1844cb5fbfb087ae803ddcecfa377daada2bf866aa104a405c3883b055f70020922b90aa1f8cbb4600e56e00504159
27 DIST linux-5.4.173.tar.xz 112885592 BLAKE2B 1c1511e730e42d80b7e6ef2f48ff9c990285f3e05cc18876b6c4901979ff85940283354c84db5dcad81a52efc7c516040243b03d9692291e1a6c3b48059079da SHA512 9ca63cd8e68df9556a7126a535337205f6cc3e83f79908d6805287e44565f7638683b969d2d40a2badba0d18547712b675fa42a64236d3d24c4fb142175e0a2c
28 DIST linux-5.4.174.tar.sign 991 BLAKE2B 3a76dfaac9eccb8e1d7d6e494796c103457c0ab196f0e6ba77fd7b89c75a505522599e86d68e55eec5a2e8aac2715bf9c3f0c211642b65446915c3c5dfdbd35a SHA512 e99359a4beef8ec531378d7a0b397fdd887a96938757661280ab60041bfb27ea09414de176c958860f502f5ecfce4fae57d457bfd9c990b2f361ddac3d7c47c5
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.18.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.18.ebuild
31 new file mode 100644
32 index 000000000000..ed253cb414c7
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.18.ebuild
35 @@ -0,0 +1,132 @@
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 +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 + hppa)
120 + return
121 + ;;
122 + ppc)
123 + # assume powermac/powerbook defconfig
124 + # we still package.use.force savedconfig
125 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
126 + ;;
127 + ppc64)
128 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
129 + biendian=true
130 + ;;
131 + x86)
132 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
133 + ;;
134 + *)
135 + die "Unsupported arch ${ARCH}"
136 + ;;
137 + esac
138 +
139 + local myversion="-dist"
140 + use hardened && myversion+="-hardened"
141 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
142 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
143 +
144 + local merge_configs=(
145 + "${T}"/version.config
146 + "${dist_conf_path}"/base.config
147 + )
148 + use debug || merge_configs+=(
149 + "${dist_conf_path}"/no-debug.config
150 + )
151 + if use hardened; then
152 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
153 +
154 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
155 +
156 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
157 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
158 + fi
159 + fi
160 +
161 + # this covers ppc64 and aarch64_be only for now
162 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
163 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
164 + fi
165 +
166 + kernel-build_merge_configs "${merge_configs[@]}"
167 +}