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, 20 Jan 2022 16:12:07
Message-Id: 1642695111.323ac7565a5c8def17c9fb41cca6d193da6a9bf0.mgorny@gentoo
1 commit: 323ac7565a5c8def17c9fb41cca6d193da6a9bf0
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 20 14:39:42 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 20 16:11:51 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=323ac756
7
8 sys-kernel/vanilla-kernel: Bump to 5.15.16
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.16.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 3fae6dfaa5d6..b3c437dc0207 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -45,6 +45,8 @@ DIST linux-5.15.14.tar.sign 991 BLAKE2B e6a60db6caa728c9c182e5fa633603cfbef54657
21 DIST linux-5.15.14.tar.xz 126183640 BLAKE2B 4276e3a03f6a8fb44ce91f11ff4abbf8e0aca20122c5c1231da74fccab1105af8a76c34a686ba8b038737ec5117d64b549e85cbfc1b3238c69bbf8149e8f7774 SHA512 fe4840ae50777cfeceadf6482fff46c761059921eab6b80725f32b90da36d2a12c07bb177d59c118d6b76037c4f84225fedcb22e46eedf83f77db5b7a70085ce
22 DIST linux-5.15.15.tar.sign 991 BLAKE2B 170db66d0a610a9f7f3e6cda40cac23b7c6dc8e440043a9ef6aafdc9d57bb0d9e92220a9323ddf09dce149a78f303f1e97e0252196ac26cac2331d030abd84b9 SHA512 3190da2bd1d1c110b7b7e9298855d19723e75b4661a49d750903f9c36f3ac53caf399071b4489f25353bbc237876584766a36cc17244ebb3ba2c5a1eff3c2d53
23 DIST linux-5.15.15.tar.xz 126192480 BLAKE2B 56701912c1829bfc6308500799546c28e95bc5a8ef334d7c065651c1555b1f976ef46d715ba239652b26417334d4d4d904c308ece403a6da03b8fc78000bb7c9 SHA512 e993b269777f494c729f55380d4b628310fd0cd9cabf3b967eb5b6471fb37d1581dd92dd3e23f7b476620d65a23ca6e409fd9e512683ffc84d33774e4c485fd7
24 +DIST linux-5.15.16.tar.sign 991 BLAKE2B 0523e495f73946be58c751189eeac9eeeff5eb9869a9798bc742fcb08359529cc43e2bd991e998cefdc6f4ab3e3e8f8da7a8ee56b25bae266f2f144af236f568 SHA512 7ca0a4db533570a8ea8c12a3ca477adad8be94020da33a6e666676d5dc5a7b7f3e6eab4772a0122d1cf3bda39294f42ed2429798414d41cc5c89ab9ceee8a901
25 +DIST linux-5.15.16.tar.xz 126178716 BLAKE2B 73b2f6a135c89db2ffbba8d8271761df3b98e0c844821367a3e009d67a5df27d11f02265eae34229b699c7308d4cf505f0f4a751a8135b6a6f0bf46929cbb785 SHA512 a2e3dbd92b2079a64af4d4a17db998381b5afe41ffb8b6b7fb43a69eb93b1c6d766b4b8ebba287d45f3de8392e4808cca5a7ccd5da5d42f7f58a57bf17ce5d10
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.16.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.16.ebuild
31 new file mode 100644
32 index 000000000000..31d86b549563
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.16.ebuild
35 @@ -0,0 +1,129 @@
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 + 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 +}