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: Sun, 03 Jul 2022 07:39:02
Message-Id: 1656833922.40face7d322c77f55de0169176597f49a15a040f.mgorny@gentoo
1 commit: 40face7d322c77f55de0169176597f49a15a040f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 3 03:33:04 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 07:38:42 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40face7d
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.128
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.128.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 2b80f649de4f..3ebf24756e07 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -23,6 +23,8 @@ DIST linux-5.10.125.tar.sign 993 BLAKE2B 0bcef2b389a8058d29039fe5c3985745e6bdc43
21 DIST linux-5.10.125.tar.xz 120432884 BLAKE2B 935895819c52ab31f4a8e305d97e412318684324992b1bfde581c0a05d2cb452e3eb7ad9ca9b7ed14d8ebbca8069df769a3b923d70d013d2eea11b1ba0665f15 SHA512 8ef183c5c460f0ef7910c49003695e064a5ac67d1a77114f6cd2d39e739f9c86ce7e3458ed2f7570469fe273cac34931297064ca47169a3374a7489d002f5259
22 DIST linux-5.10.127.tar.sign 993 BLAKE2B c085f64d89b1f878a8554911091603131005508dcb97268246fc42e56527b7f103703e30c744ee36c8ddf3b2ffb7caad5b46a4cb84cbc7f5169f1b7b8675d434 SHA512 1673be243a21abf2a22ef59f6b2ef7883831108767c495b1ea8dc792c794858d1fcf36a4f7ae11d28ac01a1fd5da78a478839a13b2bad060b5cf6c5cbed159f1
23 DIST linux-5.10.127.tar.xz 120415864 BLAKE2B 46122653b3d5d1716c4e21a0571a26d73229264097fe94acfd1f8fc77691d83ddaf42b379a9d2000d379ac58644499443b035709d4e57d550e6eb2ca01053a22 SHA512 2456b564b3124491dff07f818bcf9ceb63becf4de618a2797e7d1e8b412bf296eaa69dee3d1f63c0cb5a5121776a23cf15a090204f5938d8a9c59bb0480cd146
24 +DIST linux-5.10.128.tar.sign 993 BLAKE2B e79fe715fafcdad93960bb402d16a0c38325693ae15f042d7231e4917da88011079a2982e3389b60adc2e5491d98fb785187e727251d07ae87730046f7b19f5d SHA512 f60e75662c802b5aae5f59f3e69ebef5f6411097f54a659fe0e153ca90b890bbce691222c61444f2ec8c0d5e31098caac3b73d73f83dc66327e601c920be153a
25 +DIST linux-5.10.128.tar.xz 120435292 BLAKE2B f55bb329c8c577123dddd98eef91925f2804a463406313629f9ec993cc82718fb1bef82a921ce6ce6ef5483437468ae3051ec371316515ea6d34a29969e02fb9 SHA512 c652373845c58ed224fb51402326abc4f0bd6b237d6dfb132503b3352eebf4ef1cbbaa69b1e5a62c2297d194bef0538cdaf6334d8f334a0834d8701a0bc6f3d9
26 DIST linux-5.15.48.tar.sign 991 BLAKE2B 763026ae690c17bc2e1fee512fa792425a9bdc3ac15f35ffefb32d99adda90e1a0acb4bfa96528b1f90f50127b5a4cb86cb5a7b44fd8ad78f4d31312ed8ca9dd SHA512 160bcdb7aa692c5413ac7b13bb6548c73b0d5256df8eda25d02d910d8de3b9afa27820da4c4273f7f7244265c92e1dca88f70ce7deeab7d9f670af49f1cd03ae
27 DIST linux-5.15.48.tar.xz 126357096 BLAKE2B a23dd33dfac22741e5112961d92543a895c858be62c4e82a60b639e47c7b05e623c41a13a6c5157ec7b71ae1f152b381b7729f2bbaf03734cd40dfc0c27923f8 SHA512 6eee3ff3352a864a5d98295527056da0d6d52b5f566fd7858b2e12a5d0094efea0af484a7e8cdcb344bba343c5d95b5d19c0d2756dd3f38531712438223755b6
28 DIST linux-5.15.49.tar.sign 991 BLAKE2B 18117df94ba81e7581b1e20d9e97dbbc219680a7f14306e6943ab7165b93feb49bdb0f491e5a0b34f921c729bf368d475fbb4745b29ebc9130bb50583fac061d SHA512 f64b92e792ba1834ad9604f756189bba6179f76257c58b69fe5121594584f413e44e4a77f0826461c23e0e9795ca4fd1f0a54bb562514d991552a7351c7abfb7
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.128.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.128.ebuild
31 new file mode 100644
32 index 000000000000..96cb3e86fc4b
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.128.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 +}