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: Wed, 03 Aug 2022 19:51:40
Message-Id: 1659556289.ae65ad5b74bad512a4a21e40c8d76bc9e6b110a9.mgorny@gentoo
1 commit: ae65ad5b74bad512a4a21e40c8d76bc9e6b110a9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 3 16:35:45 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 3 19:51:29 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae65ad5b
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.135
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.135.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 77a98f2e161b..788c3244b940 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -29,6 +29,8 @@ DIST linux-5.10.133.tar.sign 993 BLAKE2B fddcc2dc991ee0ee8d5b81015bc62c17f3e1edd
21 DIST linux-5.10.133.tar.xz 120457796 BLAKE2B 811a5a7b1796dcb90baf7dc3f5f39947e409f8f8c6fc6364e3269c6a8735f912dcf8e2b03b62022222b20c42fe6590e7a500c04a20c9df44dc7f6544b18795e7 SHA512 980b290bc619a843aaa1ba6cbbeb6c796cd63ec5cbcb6de820afaa33a28a64b746cda73b921babb5d9110b19dff6fa47f368d3427552443b8c2c929c35ba65f0
22 DIST linux-5.10.134.tar.sign 993 BLAKE2B eea6723cde53024b73aa785c82dd733b5bdbcabfd6229e1f0f70a5554ca0a183bd6616d11a32de152c026551a56bfe20e963e922baf03458857100d37db7ce9d SHA512 a291efb27ef6714aa970c8e129068f1e32ae0e10fd228a9eb0a4ace04b32f3a097712e2703f0cd43b26d2a0ec9c76d2b9556f8b4ed6e058065baa99fba7ac9dc
23 DIST linux-5.10.134.tar.xz 120457660 BLAKE2B 16d43ce64d24bc26849c72749890159fdb5754913275f9829edb13a753991afc9e738f38f105606d6af62891708aa0134d860592ba33cc5bd1d8038b238de363 SHA512 888c5f1000329deeba66e7452d64344b589313e6494d96bb62c89250ace93d7ea5f9201b0b203b6730f5de34e04bd4b093ab4592ec7837ebaf09b2348be20ef8
24 +DIST linux-5.10.135.tar.sign 993 BLAKE2B a544cdf24ef0f1dc5ddc5622d8f00dc3af0fc38604d955c7a8b54e0c1fa7f7d60197551710cc2ab0bad69fc06d2077e5b1b796259fe29665d558b5fe656beff1 SHA512 ef565e3ae98acf58fa871e701b8a4ad2a3fd1f5aae109685cf1bd5cf0d2fca3f8361ca5d0d14613311a1bfc5069013249ece0f6eec4b88b2c4157caeca0686d6
25 +DIST linux-5.10.135.tar.xz 120470192 BLAKE2B 121edb3af02eb4c00195e2c4e1144636bd33fb89143fe5bf46acd924bfd00665ee17837dd2426b9a9b16ad0725f1a944350446cbd00276af30623baea84bda67 SHA512 6b945179f375db6d76e3761ddc5b64a987c27bdf9d52694ede3a158f265710fe5a8f4f4b2752641076e64a62160d501081b560675eb855305703e1fd79629d47
26 DIST linux-5.15.52.tar.sign 991 BLAKE2B 321a5eb8fd8cad2d14705ffdea3fc0ad5cc4618defbe8426b978aac10c28dbf0b4f15a571c16c22ff2437f87ab8d70ade815c5f76ce0d763ad66846a27e02349 SHA512 1ab45e728a768b704ff52551e31cf91fa8a6ec008e3f2aef387b925ab18dcd837f4a4b71f85a7bb96b0ab403c39757ddfa8d22578117728f594768904bc5ce62
27 DIST linux-5.15.52.tar.xz 126364084 BLAKE2B 9baf5b0182df91790716f3629a6e163cf87d8e9bde79350f30432e7446d2033de9d081f1693a758a3830a26c03a8bc13713394fd82457afde33ecfb9e353de2e SHA512 01852559b30b177ba350827b076dc58ecad020e63940482e694286ade3debe53919a4514338536f46da1aa4f89b671368a112a913a53a0352d033252bc6b2a1b
28 DIST linux-5.15.53.tar.sign 991 BLAKE2B 4d890ec6f124577094dfa178fd64dcbb99ef7f07f3ab5bc6c5591c1a2304286ad8285b3d7bb405cb127b33f05a4bd2bb03d0e438f50c1fc466346e3530814a85 SHA512 e7206e9551b89b3aed1835d8e29832ad457d4c375ccd53c4306bd390d714a6a9329d4bb2f71bc2c2dc4bf932ada7131c5383f23a2d71c44b6a0a8365de7a9b7a
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.135.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.135.ebuild
31 new file mode 100644
32 index 000000000000..718e3ea82627
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.135.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/projg2/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 +}