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, 23 Dec 2021 00:12:31
Message-Id: 1640218331.9bd4bd1af88f5efad0cea742ec8400c3d0feec9b.mgorny@gentoo
1 commit: 9bd4bd1af88f5efad0cea742ec8400c3d0feec9b
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 22 15:01:56 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 23 00:12:11 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd4bd1a
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.88
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.88.ebuild | 130 +++++++++++++++++++++
14 2 files changed, 132 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index d5a5297cefc8..1b62dc06017b 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -25,6 +25,8 @@ DIST linux-5.10.85.tar.sign 991 BLAKE2B a15ca5ba6b75d8ab118c7c578a33d47224f9b2c9
21 DIST linux-5.10.85.tar.xz 116476312 BLAKE2B 629b8423f29454b25a76165933ff82a50d8d80826465529814465862869a0721775f344c738731cc3895cad11043efdf76ed909c1db5782f55c608599a118064 SHA512 9c8d9fc12c48c7c1c4691ca95de4f06c148686618013546d848a3d463261961e473ac9abe909ba3b79d1bbd5291153c797cde577b10990c825ab14cc1ee0c21c
22 DIST linux-5.10.87.tar.sign 991 BLAKE2B 757d7e7869bbb45994fa77cf6ad97be184abbe7060e09d80b41ae224f44504e350ced5c11614f7708960f10b6b2b77ca8b74d056436617a32e3f25f020bfbf0d SHA512 52a1f21ca87ffc86f8886814457987b35fd7b515611367c24a08c536788522a8a74caeb9b2130f28f52df02a5985f85a08eb5c95b1e64eedb76aba37f4e04fa8
23 DIST linux-5.10.87.tar.xz 116483412 BLAKE2B c9a624641fad9c48289db27d35a4ce8afe2ad70287deea308a4a20abd0fba1247ba2985ba2c7bfa2f894e3b834510feb1f35f062788c093f629803faaa1cef4a SHA512 97fe37bd52d7d02519ed06737e94a5fcefff944e26e69b90abc4a7ee91fce031ad0778b0211365c225da57a2eb1bbc0236cb3482635137149ad5c5a2bf22e382
24 +DIST linux-5.10.88.tar.sign 991 BLAKE2B 8ba7edd3b3d0b96c5b9ab70d4290952c41327edd7e7cf707b84eca94714a1cf05577d8b6d8d7d419986ae384a268f36157edefe6b950a08aad08fc37d061102b SHA512 2c609b8baddd47db61091b9284a4786b1a22fb2848ec2d51a2b7b73232148a0e948ed35fcb39a7bff646f90ab6be28d81e12bd8358cd3161a88beeea8762d306
25 +DIST linux-5.10.88.tar.xz 116476744 BLAKE2B 89a496f0ec427061c04a5568bdfdf04ad4ca55b3c81853ae9f64d53608efd39d55d8f2074f7dbeb9424f6b9cf9b5d9674b98a05d24414dc0ccb076a9f9d27685 SHA512 b4400a65dee1e5e7bafff69012078e81467e9a7aeba0eaaa84137e7056b5b79893eb62ef4309a340b23770d3785a7d236e837e6f39f24e58db00a8b4d9190a4f
26 DIST linux-5.14.21.tar.sign 991 BLAKE2B 159182d90911e738c0693c839441f679b66fa3e75c61bb55251552b1ebb7bf6ad018d66d0a83a8f88935b88c1f39fea1207a94f3fd4af3d1e5d148cf9293baf9 SHA512 1c2639bfec52b2f8cfc69504b7f474d1d7a96dc1793e8cd77a6160718a5f381c5e57e42339bd5361e83b86c84cda2500d18615bfc210bbe989c0560b275f4918
27 DIST linux-5.14.21.tar.xz 120726436 BLAKE2B ced805df81421f328e2e08d50a33bf6ba54092e95c84d7c1c8ec25ad909c183f82c9966a074c274dd0d13b069b87c12c6f6d5593faf3c0813c4369f90fc4a24f SHA512 0f428cb7273de5b440b610b1a3709563e4ed955afb4df084750a8b43c45e5b000a5906780ff7079a8324fac0a8b7ecace778ab8bbf0511fba92d4dad160d7f87
28 DIST linux-5.15.10.tar.sign 991 BLAKE2B 22e5f6b14793a97fcdf0b7f1e109d726cf541dccfb27c44fae4f39b76b4ffad2834171fd40e803bcad1a2a7ce6fc5a6754c7e1387e65991043d679619095915d SHA512 2580426744f80d756a57566fef7cd0d410e85c69514fcd1986dd40b82743342cb7ce0dbae0e8de56d8393037534cf5c8af6cc70f750b71b44a6204731c9c50c9
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.88.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.88.ebuild
31 new file mode 100644
32 index 000000000000..ee6eb2c658fe
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.88.ebuild
35 @@ -0,0 +1,130 @@
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.10.12
46 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
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+="
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/v${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 +S=${WORKDIR}/${MY_P}
75 +
76 +LICENSE="GPL-2"
77 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
78 +IUSE="debug hardened"
79 +REQUIRED_USE="arm? ( savedconfig )"
80 +
81 +RDEPEND="
82 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
83 +BDEPEND="
84 + debug? ( dev-util/pahole )
85 + verify-sig? ( sec-keys/openpgp-keys-kernel )"
86 +PDEPEND="
87 + >=virtual/dist-kernel-${PV}"
88 +
89 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
90 +
91 +src_unpack() {
92 + if use verify-sig; then
93 + einfo "Unpacking linux-${PV}.tar.xz ..."
94 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
95 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
96 + assert "Unpack failed"
97 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
98 + else
99 + default
100 + fi
101 +}
102 +
103 +src_prepare() {
104 + default
105 +
106 + local biendian=false
107 +
108 + # prepare the default config
109 + case ${ARCH} in
110 + amd64)
111 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
112 + ;;
113 + arm)
114 + return
115 + ;;
116 + arm64)
117 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
118 + biendian=true
119 + ;;
120 + ppc)
121 + # assume powermac/powerbook defconfig
122 + # we still package.use.force savedconfig
123 + cp "${WORKDIR}"/linux-*/arch/powerpc/configs/pmac32_defconfig .config || die
124 + ;;
125 + ppc64)
126 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
127 + biendian=true
128 + ;;
129 + x86)
130 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
131 + ;;
132 + *)
133 + die "Unsupported arch ${ARCH}"
134 + ;;
135 + esac
136 +
137 + local myversion="-dist"
138 + use hardened && myversion+="-hardened"
139 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
140 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
141 +
142 + local merge_configs=(
143 + "${T}"/version.config
144 + "${dist_conf_path}"/base.config
145 + )
146 + use debug || merge_configs+=(
147 + "${dist_conf_path}"/no-debug.config
148 + )
149 + if use hardened; then
150 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
151 +
152 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
153 +
154 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
155 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
156 + fi
157 + fi
158 +
159 + # this covers ppc64 and aarch64_be only for now
160 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
161 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
162 + fi
163 +
164 + kernel-build_merge_configs "${merge_configs[@]}"
165 +}