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, 27 Jan 2022 15:06:23
Message-Id: 1643295963.b38257b7192f865d708da21cbac7bdd3512cc3b8.mgorny@gentoo
1 commit: b38257b7192f865d708da21cbac7bdd3512cc3b8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 27 12:35:34 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 27 15:06:03 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b38257b7
7
8 sys-kernel/vanilla-kernel: Bump to 5.15.17
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.17.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 28ae4f43e479..d1bb3d90e26b 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -16,5 +16,7 @@ DIST linux-5.10.93.tar.sign 991 BLAKE2B 99714d74793b5012c4e2767d796655002b31098b
21 DIST linux-5.10.93.tar.xz 120342268 BLAKE2B a174f9513127835a0753cde0f26d14a929563f703a8ba2343e1b09dc3089d96b85680c9d7f49e2d3860241ce3e258a0443c861f143813709987378bea6d438ba SHA512 a152188e394258d0694e7e47a05a109068492d985251f468f2b883881f1234f3fb269c9d5935e3299c7cc2bfb66cc7948e5d36f69700049580d4f9cf4ff1cc94
22 DIST linux-5.15.16.tar.sign 991 BLAKE2B 0523e495f73946be58c751189eeac9eeeff5eb9869a9798bc742fcb08359529cc43e2bd991e998cefdc6f4ab3e3e8f8da7a8ee56b25bae266f2f144af236f568 SHA512 7ca0a4db533570a8ea8c12a3ca477adad8be94020da33a6e666676d5dc5a7b7f3e6eab4772a0122d1cf3bda39294f42ed2429798414d41cc5c89ab9ceee8a901
23 DIST linux-5.15.16.tar.xz 126178716 BLAKE2B 73b2f6a135c89db2ffbba8d8271761df3b98e0c844821367a3e009d67a5df27d11f02265eae34229b699c7308d4cf505f0f4a751a8135b6a6f0bf46929cbb785 SHA512 a2e3dbd92b2079a64af4d4a17db998381b5afe41ffb8b6b7fb43a69eb93b1c6d766b4b8ebba287d45f3de8392e4808cca5a7ccd5da5d42f7f58a57bf17ce5d10
24 +DIST linux-5.15.17.tar.sign 991 BLAKE2B fc33eb461f03a37408dc5fffa8360da639c0d6e30ecc60eb25879cf8988dd500a76b38e90b880311cfecae150b81491353dcc5da8241e5bbc4e212ab78ef46ca SHA512 e68799de99982a71c8ee92200606ae5072cf58c8980bdcf2637bc75bd612344fdd0c893ffedcdec650d1f3474eda4d8df3083ca27c16124d6d72ee5d00ca0288
25 +DIST linux-5.15.17.tar.xz 126222044 BLAKE2B 32b9e59238ae10db425c53447a2499322b9879501fff9ed4ccbb678c17d5459e8de59696de46f751b4fc65737418a9792f52eb5f817275c88d0b9aca3ec1a6fd SHA512 ddd797a2931c80e2a2fe660e31a5b3ebc6bc5a4a8dc0220f175545016e9d9f3bf21be3b55c99a511b7391b5d91650ac5119483230fafcdac448a55b4b4d5f043
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
29 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.17.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.17.ebuild
30 new file mode 100644
31 index 000000000000..ed253cb414c7
32 --- /dev/null
33 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.17.ebuild
34 @@ -0,0 +1,132 @@
35 +# Copyright 2020-2022 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=7
39 +
40 +inherit kernel-build toolchain-funcs verify-sig
41 +
42 +MY_P=linux-${PV}
43 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
44 +CONFIG_VER=5.15.14
45 +CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f
46 +GENTOO_CONFIG_VER=5.15.5
47 +
48 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
49 +HOMEPAGE="https://www.kernel.org/"
50 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
51 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
52 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
53 + verify-sig? (
54 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
55 + )
56 + amd64? (
57 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
58 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
59 + )
60 + arm64? (
61 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
62 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
63 + )
64 + ppc64? (
65 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
66 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
67 + )
68 + x86? (
69 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
70 + -> kernel-i686-fedora.config.${CONFIG_VER}
71 + )"
72 +S=${WORKDIR}/${MY_P}
73 +
74 +LICENSE="GPL-2"
75 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
76 +IUSE="debug hardened"
77 +REQUIRED_USE="arm? ( savedconfig )"
78 +
79 +RDEPEND="
80 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
81 +BDEPEND="
82 + debug? ( dev-util/pahole )
83 + verify-sig? ( sec-keys/openpgp-keys-kernel )"
84 +PDEPEND="
85 + >=virtual/dist-kernel-${PV}"
86 +
87 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
88 +
89 +src_unpack() {
90 + if use verify-sig; then
91 + einfo "Unpacking linux-${PV}.tar.xz ..."
92 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
93 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
94 + assert "Unpack failed"
95 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
96 + else
97 + default
98 + fi
99 +}
100 +
101 +src_prepare() {
102 + default
103 +
104 + local biendian=false
105 +
106 + # prepare the default config
107 + case ${ARCH} in
108 + amd64)
109 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
110 + ;;
111 + arm)
112 + return
113 + ;;
114 + arm64)
115 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
116 + biendian=true
117 + ;;
118 + hppa)
119 + return
120 + ;;
121 + ppc)
122 + # assume powermac/powerbook defconfig
123 + # we still package.use.force savedconfig
124 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
125 + ;;
126 + ppc64)
127 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
128 + biendian=true
129 + ;;
130 + x86)
131 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
132 + ;;
133 + *)
134 + die "Unsupported arch ${ARCH}"
135 + ;;
136 + esac
137 +
138 + local myversion="-dist"
139 + use hardened && myversion+="-hardened"
140 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
141 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
142 +
143 + local merge_configs=(
144 + "${T}"/version.config
145 + "${dist_conf_path}"/base.config
146 + )
147 + use debug || merge_configs+=(
148 + "${dist_conf_path}"/no-debug.config
149 + )
150 + if use hardened; then
151 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
152 +
153 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
154 +
155 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
156 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
157 + fi
158 + fi
159 +
160 + # this covers ppc64 and aarch64_be only for now
161 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
162 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
163 + fi
164 +
165 + kernel-build_merge_configs "${merge_configs[@]}"
166 +}