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: Thu, 27 Jan 2022 15:06:25
Message-Id: 1643295971.c3ef4cbbbfb6500715920566adb6eac38f9b9b1b.mgorny@gentoo
1 commit: c3ef4cbbbfb6500715920566adb6eac38f9b9b1b
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 27 15:05:32 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 27 15:06:11 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3ef4cbb
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.4.174
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.4.174.ebuild | 131 +++++++++++++++++++++
14 2 files changed, 137 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
17 index dd8807ea0d73..c83695de092a 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -8,6 +8,8 @@ DIST genpatches-5.15-19.base.tar.xz 925776 BLAKE2B 040a1cabc9217a91e8bae89ef7878
21 DIST genpatches-5.15-19.extras.tar.xz 3852 BLAKE2B 9ae7ef921212fb3b67dedf9647e0ca3091382410a5bf9c7ae67539f9cac0b97f54eef1bb63279481722184bf0e64d4208928d9485f670e47f0c60e62a0bc036e SHA512 462cc99b18a41f5dc2265732d63349c17696d5ca4e360e23e50ecfe56f3b08ce7d5bb0dc1505011cd5336c16057d1f9d97c3faecb551f4eeffe4d8ca95938998
22 DIST genpatches-5.4-177.base.tar.xz 4317444 BLAKE2B e7ad5f0a561dc50a11aa3720c3096230d8209c58a523da7f6f0fb1b0c8ed903780d74c48edc2791f8d8ba7fdc946ef0fc506d73ff3f86e9e2bfb4c05609d4456 SHA512 0e04707f1f5e85b53f425d54c74d9483d33280769d1cdd5122e34d19dfea1fcf0cf258d84579f3f169a1f620d9107a7d454970da313806c5edbad8a6d8632c9d
23 DIST genpatches-5.4-177.extras.tar.xz 1784 BLAKE2B e840ca0c6b2dd9399ff4f0d03e828bbb42f53528e1c13b2825c5439cbccdc36577f029caccf91690857cd6e4901cebd98cc27e2ad2d0644c7503822563f38d0c SHA512 a17abf06bb76236986b9a86f671dc60544b39fc47736aca69359e6d68699a52a3e72b1a2ebd57f78602114e9d1f5a201f37121bd6917f50c9d06e385b194cb20
24 +DIST genpatches-5.4-178.base.tar.xz 4382260 BLAKE2B f43573bed5925ddad264a150c6bf7e769771cbb89ec56c0c07f73375c19386ebd15b538b12b89c9e18ad3592b1be038288f8bc4e8ee4365fe92c118d81e3a5a7 SHA512 26fec31e23bb0758ec4a5c5542868795172d7717dcb1323cb9a930cb9b60c860cd033836d9ef80ab327a85656f4a70a46a597ffdb8e9ad27f7431d1bd1944b31
25 +DIST genpatches-5.4-178.extras.tar.xz 1788 BLAKE2B 23bb980b7e3fb49b1905df1febe219c3b3ad573a4757b34c4c54c7b61b6c1a175d45c873267c89d5345015c2d80761de30e52aa2e812dd10f71c6db32dcd7a22 SHA512 75c6b8d3cca3099527ef38163324cbbb8c2764c1693cbefcdcf0835bffcf500354f78813a4c625ca0eaf0d86ce6c9524aa8e4586fedf00cb662ef6960a55339d
26 DIST gentoo-kernel-5.10.93-1.amd64.xpak 65587762 BLAKE2B bd99d1842a244a3424b835106e6478a7e010ec07bbb801126f3492f8300438885b2ce141b08e79e89329140a606e27afb6ae8d5f19c8f22526bd31a76b9933c2 SHA512 19c3063f034b6c4265a7a821116d5ba01c26975863b9205181eef6c8ff189ca5dd2199452f24b9d6dec8f88deeac788095f9138f69e30511252cc35e7a807d00
27 DIST gentoo-kernel-5.10.93-1.arm64.xpak 60910039 BLAKE2B 362765c54257379558cfdae5ed7603646e693c239147ac33f4994da8cbd3e0525fb4f859838ba60dd55eb7df4ba6cf2f8d7d660e6acdc995d9983bb9725c298a SHA512 39a7f6e4b9fbbe8188c8dbfbfd7d141e0d87eba038c9766874cfe37c202d87fcbfe7c44aea1c7edf100852c4859d1c9891ed1018ec8bcd8e45ced8c5b2032e7c
28 DIST gentoo-kernel-5.10.93-1.ppc64le.xpak 55673233 BLAKE2B 1058a631e87d651ff9f3514595e93af6b796819d508730c6357ce7db701c1dcc9a27f05a6179183cd1679e71ca7eaac4bc335e40869efbd8dab2f94cf5ddfc12 SHA512 0653cb1877b7f1988964c310703462dc010213a1d63641f6c9ea7dc7e3eeb3686baff88f765ee431bb4d6865b12fed92fae26cda46b5c61ec9a100750a57a7b8
29 @@ -28,6 +30,10 @@ DIST gentoo-kernel-5.4.173-1.amd64.xpak 61491991 BLAKE2B 3f675236bf895b44d790d0d
30 DIST gentoo-kernel-5.4.173-1.arm64.xpak 57634871 BLAKE2B 2a8f8b5a9e5d7050ca931591f5d922ec34018784237fb678de9c4b365822b17eb85da9a3f4725dc36ba6550afa9720ece0c9c4ad29ad3ab475b7770f7e0d3cca SHA512 887e4bc46b2de5affd6cd318330774c9a4802053e21c4430bba205cadbd3c49083d63fb9685ddb82c24e93d55b3de8f43ebcf00d76b8a8966fd61170bc6a7459
31 DIST gentoo-kernel-5.4.173-1.ppc64le.xpak 54968644 BLAKE2B 3b23f23aa63b8bc0235cfb3e169a27f9226c8ccbf785361accf7906d3b1963cffbf71b5ad05146f9ba676daf8bc4ccb3d32f86c0d27ed8aa7b2fe1bd43836eaf SHA512 7312d2f633cc410d4af4fdc2706de3cd971bf012484bb226f1e47fbfec84b642293145be5d92c11f30485f38458ef81bc50147d393e1a145ebdbf0c602a55e9b
32 DIST gentoo-kernel-5.4.173-1.x86.xpak 53179904 BLAKE2B e5c836a582d3f19a6b62c8a39491fcd61cc0d6bc6822124e8a346ab91aee829f43f840e07f08ae4dd1125d21204a54f0d6a5a4a4d0d2265aa3be7b3b43aeeab1 SHA512 645e814aa73d0d4d9630686ce335d7cd26cda51fec1ca7d561cccc080c1182b832c8fdcbd780059c1c9ea66a9df9e108dff9507fd4b7b327e54a50feced08dae
33 +DIST gentoo-kernel-5.4.174-1.amd64.xpak 61501128 BLAKE2B 2e235c50c7d689733a9b23fb01fda54b39392c4965ec364a28cef7a6bacd39d74282df490a2281a58912f4da2ef28913118c27bf03cce81a08ae8ea19733e286 SHA512 1f270923e16b0fd90914a76d1b4e6e38fd6766cadb082c9e823f11ab758fb56571a370d0a197f9845cde0f84a24143755063f332b4a3e4dc43b661f2d43dad1e
34 +DIST gentoo-kernel-5.4.174-1.arm64.xpak 57639288 BLAKE2B 80578d817dec15a2883931381b41000132ad0b51b428458caa2386bf5ce430af2911d2cba7fc48242c93de519c466a87d0ac8bba984949f81b27fd7cd9d5b1d5 SHA512 ca5c8568ace3c0df314612090cbfa39815f3c91246dfcd5c6e6f57d8f636138354df42a0c990c49386a9d9ab228e5e1f3a9d80fd182d699ef7d21c89b06b83a0
35 +DIST gentoo-kernel-5.4.174-1.ppc64le.xpak 54936060 BLAKE2B 1e2cc2356e0c425e1a5249c6438ecac8b4e28bbd39d76a7b196ee5f6a5160d0d7ee754f23d7f34afbb8ec4fc57965388749f4cac906ad91e7ce254b76005ae33 SHA512 18dc483ac38d28fa8173d591987c01686fee941830652536dc9eafefc5f6cd59f603c57580cc081224b89325b1a1d00b380bc96174260d7211e389f13d98bcec
36 +DIST gentoo-kernel-5.4.174-1.x86.xpak 53190980 BLAKE2B f6397855fb596dd0433c0ffbb24ba214d547670460bfeedb2ed57c4d1c9d19936f03a6f46cb9b8dd25b45446f22500995606dc730fc9be07d765e0fdde8f5684 SHA512 725cb88b0eec3ed9813004b48c4ae4543d94c492946e23f729977c9ff3b5caa635133bfd52ccb580c7d489a47560188c199b54c8ddcd835e8a01d1d9d7158848
37 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
38 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
39 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.174.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.174.ebuild
42 new file mode 100644
43 index 000000000000..5bdada88d281
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.174.ebuild
46 @@ -0,0 +1,131 @@
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##*.} + 4 ))
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 +S=${WORKDIR}
81 +
82 +LICENSE="GPL-2"
83 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
84 +
85 +RDEPEND="
86 + !sys-kernel/gentoo-kernel:${SLOT}"
87 +PDEPEND="
88 + >=virtual/dist-kernel-${PV}"
89 +BDEPEND="
90 + sys-devel/bc
91 + sys-devel/flex
92 + virtual/libelf
93 + virtual/yacc"
94 +
95 +QA_PREBUILT='*'
96 +
97 +KV_LOCALVERSION='-gentoo-dist'
98 +KPV=${PV}${KV_LOCALVERSION}
99 +
100 +src_unpack() {
101 + default
102 + # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
103 + ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
104 + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
105 + eend ${?} || die "Unpacking ${BINPKG} failed"
106 +}
107 +
108 +src_prepare() {
109 + local PATCHES=(
110 + # meh, genpatches have no directory
111 + "${WORKDIR}"/*.patch
112 + )
113 + cd "${MY_P}" || die
114 + default
115 +}
116 +
117 +src_configure() {
118 + # force ld.bfd if we can find it easily
119 + local LD="$(tc-getLD)"
120 + if type -P "${LD}.bfd" &>/dev/null; then
121 + LD+=.bfd
122 + fi
123 +
124 + tc-export_build_env
125 + local makeargs=(
126 + V=1
127 +
128 + HOSTCC="$(tc-getBUILD_CC)"
129 + HOSTCXX="$(tc-getBUILD_CXX)"
130 + HOSTCFLAGS="${BUILD_CFLAGS}"
131 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
132 +
133 + CROSS_COMPILE=${CHOST}-
134 + AS="$(tc-getAS)"
135 + CC="$(tc-getCC)"
136 + LD="${LD}"
137 + AR="$(tc-getAR)"
138 + NM="$(tc-getNM)"
139 + STRIP=":"
140 + OBJCOPY="$(tc-getOBJCOPY)"
141 + OBJDUMP="$(tc-getOBJDUMP)"
142 +
143 + # we need to pass it to override colliding Gentoo envvar
144 + ARCH=$(tc-arch-kernel)
145 +
146 + O="${WORKDIR}"/modprep
147 + )
148 +
149 + mkdir modprep || die
150 + cp "usr/src/linux-${KPV}/.config" modprep/ || die
151 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
152 +}
153 +
154 +src_test() {
155 + kernel-install_test "${KPV}" \
156 + "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
157 + "lib/modules/${KPV}"
158 +}
159 +
160 +src_install() {
161 + mv lib usr "${ED}"/ || die
162 +
163 + # FIXME: requires proper mount-boot
164 + if [[ -d boot/dtbs ]]; then
165 + mv boot "${ED}"/ || die
166 + fi
167 +
168 + # strip out-of-source build stuffs from modprep
169 + # and then copy built files
170 + find modprep -type f '(' \
171 + -name Makefile -o \
172 + -name '*.[ao]' -o \
173 + '(' -name '.*' -a -not -name '.config' ')' \
174 + ')' -delete || die
175 + rm modprep/source || die
176 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
177 +}