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/gentoo-kernel-bin/
Date: Mon, 09 May 2022 15:01:38
Message-Id: 1652108481.ce02cc6d8303919b29532743e054137adce9e9fd.mgorny@gentoo
1 commit: ce02cc6d8303919b29532743e054137adce9e9fd
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 9 14:59:22 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon May 9 15:01:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce02cc6d
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.10.114
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/gentoo-kernel-bin/Manifest | 6 +
13 .../gentoo-kernel-bin-5.10.114.ebuild | 135 +++++++++++++++++++++
14 2 files changed, 141 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
17 index 91b99a932576..b7e3e53cac68 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -4,6 +4,8 @@ DIST genpatches-5.10-121.base.tar.xz 3366696 BLAKE2B 121f7445e184846460c5501e9d2
21 DIST genpatches-5.10-121.extras.tar.xz 3868 BLAKE2B 8ac8a382c1d7bbd47dc8761e26ae63ccb501decdbf43e4cde641441c1e08a711a9734320cb9a28e46c3d22a0dbfe5f0d2b3360f299878e5ed46c7cba2fd7b64a SHA512 f050bd3cf40e8d4d37a8652ab2af932fecc38a834c6baceab1c79cc6aba47f3a19e59aadce250c5b5302830e440001bd7a4c9a380d8ec35e12527ece903a69fa
22 DIST genpatches-5.10-122.base.tar.xz 3383656 BLAKE2B 78310ae21efea3a38f91ee0a511b08be4f46ce75b0f265c7fef1f758f7aa854a69d05195e7bcd541e19712be59b80ba9b6758390630e716886164437020ac014 SHA512 52cf938fb005379f27df23d59056330b672aaa8c732fb324a0a65fd41a077305797440b95b95300c0577822e64bd557173573c543ebd83d1aefe6c4d97f51a4d
23 DIST genpatches-5.10-122.extras.tar.xz 3864 BLAKE2B d8525daea96a3cbbce6eff0ff46be6a7daea3e5008f6805e2a7ede7e4aa2211b52da3b413fb2b542e8720410471aa938a5733305d925e8606b6321c39472b021 SHA512 452582a28be8c6c340052fa1d58a0259c11bd686abdce28b75ad117586f557e5bb188670599a8373a8b3ea01057a8344ca0f70cff13e854adbb8b9c3bf1edf29
24 +DIST genpatches-5.10-123.base.tar.xz 3412080 BLAKE2B 8ba26d867b1cd10c372bf059c00f11260af3bb43cb636519cc4c15916359e1a74d24e58732dd0c5f4db0cda8a110360da310d6ae761e7df2a7f4e424d16ab3ed SHA512 9e0325ff0bfff0ecd56ac7d7c82f456ca2697c8eccb584798f5471b7a1247d6d91e71b39951bddc2f093e0e16f5fa71a510932359d1c1e8ae41fdb4058f467f6
25 +DIST genpatches-5.10-123.extras.tar.xz 3868 BLAKE2B 4999cfc456607422df7e8e6966c760feb8b3fffc9bab7d2923b7de3819b94c6778c1e7bf19092fa42125fa73dd35203e3c8c002e00cc62a2978f375b24d86c57 SHA512 0a9291ab36d1a3eb69f423add4bde7e4fb31c5ba318c0d9b3f235b167c2506273e9cfab79f264891d6859d7b3c5f205e689ac37eef0f16b15ff54a4da12ceb2d
26 DIST genpatches-5.15-35.base.tar.xz 1306764 BLAKE2B 5ea5655e825b9196663a7bb830ef34d74da7c9f922f7a71b46f7bc8755adacddd3b55f57e85b29532d6936ca481699ffae36642401e34293b4c6a445abb92db7 SHA512 50030f2dafba3e7fd16df7a6dd275fdbede772273009d1f1055dc904dc7afe947e92e9a32274c337938edd35073adc2e101d18a6ccd39529461d703af3e20566
27 DIST genpatches-5.15-35.extras.tar.xz 3876 BLAKE2B 5b14c88d66ede25e8417bdebc3c822d2f3755a13f21cef8a95088c97bba42a44357c98d13ce5a40e3aeb128ec0716540e893b108bf1f73256cb45250cd7ef43c SHA512 bdd8c5a700e9902cb7db17094fcc220eaca4774639d73e8496ac061fbba9fb80f6aa136aa9e87331a636af6146737fdec3c21249da7a18b5fec4d82de559e24f
28 DIST genpatches-5.15-39.base.tar.xz 1659952 BLAKE2B f40154102f23ab2b7774a998c75633598ce83daafe720930ce151a4af2a6e3647da249ffa299c7abc95c7644f51b044c4e6ea7a2378deedbf09638243c6cd30d SHA512 7646cc2f7b9467cc56bcc3e0e80475f3137eca6633800a8160d66cc81aaa87968f9f5fa6b3760a1c0ff7351d77582776a2c1a24875933ec0001ec0caad8818ea
29 @@ -36,6 +38,10 @@ DIST gentoo-kernel-5.10.113-1.amd64.xpak 65766074 BLAKE2B ab023c423ced6ae0c7fad1
30 DIST gentoo-kernel-5.10.113-1.arm64.xpak 61045546 BLAKE2B b9c93bf32c5912be5d0bbb3996c8d138317381a23eac10ecb2071e8015339f8ce14b0eec962f468ef315b85550d702c33a0cf097bf96c6818bc1683f5ce176f4 SHA512 86d9df4cefae1ed5d4f65a5fcd41f1187fa6bfe5e269e07576dfef69e623d01e0992663416797d1b9f93233f99db680664ce1f9b7f4786baa469c089b4ec99b6
31 DIST gentoo-kernel-5.10.113-1.ppc64le.xpak 55949135 BLAKE2B 7447e2d29388236a4499f9dc0ca1c9a9b9a37860ba0b07b33b9c39074780daaabaab874c680ef958198ef5ca062d4dcfb961af515cd50539efd30466d87e2058 SHA512 4590cef1ead04f45b5fa18537274f3fa598aa53a6cc06cbd51d30249a3ca3f667f60177f9cc41a2c0feb72745924693606daf673628bd584886afd707b93cffe
32 DIST gentoo-kernel-5.10.113-1.x86.xpak 57396515 BLAKE2B a2e5e391f0438d7536296e5f02e4e6d7f78240d2aa3ecffe2585f88cc0f641f04be0f76577b8d5ab3a0703641c1172f25860886ac303ba08e0d374933a8ffca4 SHA512 b19521b00a5442b59871d6ac943ba082f4649f65d5cb4224350b86b246d3b99f13688d0f1a5cb6d0fc2266450fc0b8104b57511c883ee81789825b1669129bf1
33 +DIST gentoo-kernel-5.10.114-1.amd64.xpak 65779254 BLAKE2B 7e524097759b128789c04e13738e586e06b250ae2598f82a27369b4ed6f6ce4c68a0d31d15632fa0f298a405510af0c240efe3f9a9d61383172674c4b8ad823b SHA512 75ab09f0420abf27a922ea117bee1f8abd3b735931ee5b2434ff3fb242c48f5bd755ed695eded9aae7841ba0b8b50c8b256d9ddf2581aeb338d88ecdf767e9ee
34 +DIST gentoo-kernel-5.10.114-1.arm64.xpak 61044469 BLAKE2B 1cd8e49b30fba758ad1a15aa38e132f6b60af1e8541a7df988cfa54cdddd21ad94c3e461137acd4a4fbf14e0cd6449bb3864e2c559365ac4c19ac7e72af806e7 SHA512 8e9a5480054cd9ff1247418f359aa2e86925350d684e5b819ae37511aa07e9a378e76ad7ebde4d2d804efa193884605dcb8698ad65264fceb3b9cc31a5665872
35 +DIST gentoo-kernel-5.10.114-1.ppc64le.xpak 55866738 BLAKE2B 4a8458b0ef54df586b467bfa929685b3c734dd2e7859d95dde260ab99ae047bff6f4dff0a06c3ae7a41f228a3f10f2e83afc718ddc23785ead79433dea973228 SHA512 864b4b3f39fc27aaa1f64aab954122db3eadc359c5359c8f0f752d028d9350b1253b7b2d2cb2ff18ffd7521fb6b012dc23eb9ae532ffff477b47f1e7a360f90f
36 +DIST gentoo-kernel-5.10.114-1.x86.xpak 57386747 BLAKE2B 77833a4c8fd77e3a31f0a570bc7b2bca22c92f49d8a1de6d73f359356a7b7f19c0a1b24113a904de320d387e079073fe76c4277791cbb4f55a2f7cf933b26898 SHA512 9a72cce1130027be7d8288d07a1b9aa43570ad590545a398ab562a07372417db87dc235f91f0555635081c48aed6052eb074adcd7e3d0626b15a8aa05b17b6f3
37 DIST gentoo-kernel-5.15.32-r1-1.amd64.xpak 69326816 BLAKE2B e26042a6d9b77d98d2d49f5f00bba7128a5498f01b4309a0d24e08f4d38f9b9b166bdde135aad75e005f7433af331c9bee60ec166abad8a8ccd83afebcc43dad SHA512 040cd5784b2676d58ecc7b24a1a9316ad96d2fbe03add3b4f9b679285b25185a6dc1bf1ba1a40c816763e7088bd40a185266dcf535dbb578fa5a005453ef1f21
38 DIST gentoo-kernel-5.15.32-r1-1.arm64.xpak 64197193 BLAKE2B a50633bb2a4b3c7a1ac5df5b38821b7df24f15dd883169b6e91c6d934508166fd6236c4dc3640b0bef994b7aa97551ba9b9aea8ef4e6ebb80b9131c61945045a SHA512 c4e922dd2bf942c6be335387e4266a1ed3d27ee466f7db3b4de24774e20b68e5fd2f62c5a3cb2f84db7e520211e1dc6f0c9f27040039da372cc37bafe06ac15c
39 DIST gentoo-kernel-5.15.32-r1-1.ppc64le.xpak 57890732 BLAKE2B 7e5ec0913bf2cd77bbe726e48bd236867a7f963777ceb2cf5dc86a410e98e4c5af5888a75f304492883fbb821813a8d6428664d21c55af1a36e7ab7cc9a7ae0a SHA512 c77e1e4108b06a46758209bcacd45bc42dffdfdc273290774550b8dfb1c7a4bd287db95dba4dbcf17da88db9a0a6a04cc14a20f75dcb9f467d7549dfdf9fb33d
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.114.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.114.ebuild
42 new file mode 100644
43 index 000000000000..9dc6d8cae807
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.114.ebuild
46 @@ -0,0 +1,135 @@
47 +# Copyright 2020-2022 Gentoo Authors
48 +# Distributed under the terms of the GNU General Public License v2
49 +
50 +EAPI=7
51 +
52 +inherit kernel-install toolchain-funcs
53 +
54 +MY_P=linux-${PV%.*}
55 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
56 +BINPKG=${P/-bin/}-1
57 +
58 +DESCRIPTION="Pre-built Linux kernel with genpatches"
59 +HOMEPAGE="https://www.kernel.org/"
60 +SRC_URI+="
61 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
62 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
63 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
64 + amd64? (
65 + https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
66 + -> ${BINPKG}.amd64.xpak
67 + )
68 + arm64? (
69 + https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
70 + -> ${BINPKG}.arm64.xpak
71 + )
72 + ppc64? (
73 + https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
74 + -> ${BINPKG}.ppc64le.xpak
75 + )
76 + x86? (
77 + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
78 + -> ${BINPKG}.x86.xpak
79 + )
80 +"
81 +S=${WORKDIR}
82 +
83 +LICENSE="GPL-2"
84 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
85 +
86 +RDEPEND="
87 + !sys-kernel/gentoo-kernel:${SLOT}
88 +"
89 +PDEPEND="
90 + >=virtual/dist-kernel-${PV}
91 +"
92 +BDEPEND="
93 + sys-devel/bc
94 + sys-devel/flex
95 + virtual/libelf
96 + virtual/yacc
97 +"
98 +
99 +QA_PREBUILT='*'
100 +
101 +KV_LOCALVERSION='-gentoo-dist'
102 +KPV=${PV}${KV_LOCALVERSION}
103 +
104 +src_unpack() {
105 + default
106 + # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
107 + ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
108 + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
109 + eend ${?} || die "Unpacking ${BINPKG} failed"
110 +}
111 +
112 +src_prepare() {
113 + local PATCHES=(
114 + # meh, genpatches have no directory
115 + "${WORKDIR}"/*.patch
116 + )
117 + cd "${MY_P}" || die
118 + default
119 +}
120 +
121 +src_configure() {
122 + # force ld.bfd if we can find it easily
123 + local LD="$(tc-getLD)"
124 + if type -P "${LD}.bfd" &>/dev/null; then
125 + LD+=.bfd
126 + fi
127 +
128 + tc-export_build_env
129 + local makeargs=(
130 + V=1
131 +
132 + HOSTCC="$(tc-getBUILD_CC)"
133 + HOSTCXX="$(tc-getBUILD_CXX)"
134 + HOSTCFLAGS="${BUILD_CFLAGS}"
135 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
136 +
137 + CROSS_COMPILE=${CHOST}-
138 + AS="$(tc-getAS)"
139 + CC="$(tc-getCC)"
140 + LD="${LD}"
141 + AR="$(tc-getAR)"
142 + NM="$(tc-getNM)"
143 + STRIP=":"
144 + OBJCOPY="$(tc-getOBJCOPY)"
145 + OBJDUMP="$(tc-getOBJDUMP)"
146 +
147 + # we need to pass it to override colliding Gentoo envvar
148 + ARCH="$(tc-arch-kernel)"
149 +
150 + O="${WORKDIR}"/modprep
151 + )
152 +
153 + mkdir modprep || die
154 + cp "usr/src/linux-${KPV}/.config" modprep/ || die
155 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
156 +}
157 +
158 +src_test() {
159 + kernel-install_test "${KPV}" \
160 + "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
161 + "lib/modules/${KPV}"
162 +}
163 +
164 +src_install() {
165 + mv lib usr "${ED}"/ || die
166 +
167 + # FIXME: requires proper mount-boot
168 + if [[ -d boot/dtbs ]]; then
169 + mv boot "${ED}"/ || die
170 + fi
171 +
172 + # strip out-of-source build stuffs from modprep
173 + # and then copy built files
174 + find modprep -type f '(' \
175 + -name Makefile -o \
176 + -name '*.[ao]' -o \
177 + '(' -name '.*' -a -not -name '.config' ')' \
178 + ')' -delete || die
179 + rm modprep/source || die
180 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
181 +}