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: Mon, 06 Jun 2022 17:14:26
Message-Id: 1654535551.279cb1c4f0efbad1a98d92a16fcae243c358990e.mgorny@gentoo
1 commit: 279cb1c4f0efbad1a98d92a16fcae243c358990e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 6 12:10:13 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 6 17:12:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=279cb1c4
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.120
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.10.120.ebuild | 134 +++++++++++++++++++++
14 2 files changed, 136 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index 40e5433c748e..3829c9388e61 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -25,6 +25,8 @@ DIST linux-5.10.118.tar.sign 993 BLAKE2B d449666a55dc6befeaeac7a851c88eb04c6abe1
21 DIST linux-5.10.118.tar.xz 120395788 BLAKE2B 19550892ca372803456947a8b1a6f774c04c6383262273855235d40fa1005df6ccd93638abe9e9f0b52fd0692863f07fd18901a7cf113b16af80a2030b2e9ce4 SHA512 5ce0746c3b519abe9e20d1c80264a6a8e49bc18907cc0712fd0520f8e74806028a1b3929da636d6ab88b195895f1873122122b1506b7047c37ba30ed22b357f1
22 DIST linux-5.10.119.tar.sign 993 BLAKE2B accdf3bcefbde0f75a8647910dfd71ff2656c1366c37716690b23b6d0f72d2898211ca5908e78a28bbedb6e0035cfab90a2ad321bc43a26a2c22fd9cf6338c2d SHA512 14cd205d86b7670c9c64a4615b2a7e99c55359374474032efa42f1e2f7aaca81437a3dafb5405047d42057964e0a924af5565767705e2eda79620a512d801315
23 DIST linux-5.10.119.tar.xz 120405928 BLAKE2B a21d2ecf3d779d80a83d4788e8043811967aa6456e072f25833a94769326b1ee818e3042691b3a6581d5ed1cf3afa2180ba4252ec78eb6cb5a64efa4023c0ce8 SHA512 6a067963e9fdac0289a70e2d713e65376be4058063c332ffadb5daf33134bc0342dd9d2864118820af2d06b27b75148d9c624d5039b36c2bfdcc96aa37934580
24 +DIST linux-5.10.120.tar.sign 993 BLAKE2B 885d967da77de2608bbd84d8aa8adcd87eafe986120dfe3915144ac92f0bc60cf687fecf78d168c00c2c755ccb628339881a067dd66db94b212d8f292bc883e5 SHA512 90c6746870a49f6be52ad222734b7fbfcef3fd0de7b9fd87b827be8f97766938aa776ed949b7284448385de4143dc3d3807a57e7c9326dba4c7edf8cb857081a
25 +DIST linux-5.10.120.tar.xz 120413852 BLAKE2B 791c45c935dcf77030a0f4026b795cf29197c45676cd05ce196c7cfe62f2d53e280805cdfe454698ab027e001d409595dadd7dd9c531c222b423006f976f323d SHA512 0e7aedf0dee5131779b59ade306beeb5c383fd0dde726d32878294aceefb2bf8f80672279a3db4df8efe095413f1097c9d7ac3a9ef0aafc23a005ed14928bade
26 DIST linux-5.15.41.tar.sign 991 BLAKE2B a5ffcbc8a9127288f6ec5d640178a286114343643d91d218a85e9ad9feddcb3d1febaf0d36f6ec230a732cdad0f8bc41967308049b3c7a4bece24c70ab546552 SHA512 e8420f18f3ea201669fb1ba3f6565d41ddb3c6063b81ea27de5ae51501e01a1fc73283d0fd55255f74003857ed9b07645eee7ed8a6322e986356d7b5685b10ce
27 DIST linux-5.15.41.tar.xz 126321620 BLAKE2B c92592a3994c607242053cde655ebc7ba837e2a8d06594fd14c54c63e227fab42eb9ed3e1c452a76e7258c3f46cfed447306f9cbde62c5cd96f04a334edffafc SHA512 f93bddc7c7890c5014c0b506884bd5487cddac462f74e965e869538f97e22428739e5f71badfcb6ccb5b20f642dd66b53286d85036d239245cca9865d826044b
28 DIST linux-5.15.43.tar.sign 991 BLAKE2B 6ee0c91a3c9fbd24dc3e00ba6ab379c4763179d66cf15609bfacac2255facc76ec5f3b1d5468706f22eedda9913d7f7e6acc65eed3bd45d45cbb51c38dac6432 SHA512 7ff83540856cd84bdc1961308f8a44efbc12b9653febf404044c42cde6e5fe0ccc3e6ef8121497a59013c48e5090cc8eea0df250934b3adf35e7e0fbf9adf974
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.120.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.120.ebuild
31 new file mode 100644
32 index 000000000000..96cb3e86fc4b
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.120.ebuild
35 @@ -0,0 +1,134 @@
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.10.12
46 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
47 +GENTOO_CONFIG_VER=g1
48 +
49 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
50 +HOMEPAGE="https://www.kernel.org/"
51 +SRC_URI+="
52 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
53 + https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
54 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
55 + verify-sig? (
56 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
57 + )
58 + amd64? (
59 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
60 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
61 + )
62 + arm64? (
63 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
64 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
65 + )
66 + ppc64? (
67 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
68 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
69 + )
70 + x86? (
71 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
72 + -> kernel-i686-fedora.config.${CONFIG_VER}
73 + )
74 +"
75 +S=${WORKDIR}/${MY_P}
76 +
77 +LICENSE="GPL-2"
78 +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
79 +IUSE="debug hardened"
80 +REQUIRED_USE="arm? ( savedconfig )"
81 +
82 +BDEPEND="
83 + debug? ( dev-util/pahole )
84 + verify-sig? ( sec-keys/openpgp-keys-kernel )
85 +"
86 +PDEPEND="
87 + >=virtual/dist-kernel-${PV}
88 +"
89 +
90 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
91 +
92 +src_unpack() {
93 + if use verify-sig; then
94 + einfo "Unpacking linux-${PV}.tar.xz ..."
95 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
96 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
97 + assert "Unpack failed"
98 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
99 + else
100 + default
101 + fi
102 +}
103 +
104 +src_prepare() {
105 + default
106 +
107 + local biendian=false
108 +
109 + # prepare the default config
110 + case ${ARCH} in
111 + amd64)
112 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
113 + ;;
114 + arm)
115 + return
116 + ;;
117 + arm64)
118 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
119 + biendian=true
120 + ;;
121 + hppa)
122 + return
123 + ;;
124 + ppc)
125 + # assume powermac/powerbook defconfig
126 + # we still package.use.force savedconfig
127 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
128 + ;;
129 + ppc64)
130 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
131 + biendian=true
132 + ;;
133 + x86)
134 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
135 + ;;
136 + *)
137 + die "Unsupported arch ${ARCH}"
138 + ;;
139 + esac
140 +
141 + local myversion="-dist"
142 + use hardened && myversion+="-hardened"
143 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
144 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
145 +
146 + local merge_configs=(
147 + "${T}"/version.config
148 + "${dist_conf_path}"/base.config
149 + )
150 + use debug || merge_configs+=(
151 + "${dist_conf_path}"/no-debug.config
152 + )
153 + if use hardened; then
154 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
155 +
156 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
157 +
158 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
159 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
160 + fi
161 + fi
162 +
163 + # this covers ppc64 and aarch64_be only for now
164 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
165 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
166 + fi
167 +
168 + kernel-build_merge_configs "${merge_configs[@]}"
169 +}