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: Wed, 29 Dec 2021 18:57:05
Message-Id: 1640804214.370d30a11778932360de9f4e13a5dd3ea2c68616.mgorny@gentoo
1 commit: 370d30a11778932360de9f4e13a5dd3ea2c68616
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 29 18:52:10 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 29 18:56:54 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=370d30a1
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.12
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.15.12.ebuild | 126 +++++++++++++++++++++
14 2 files changed, 132 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
17 index 21b00f2e6b5a..33862880fa9a 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.14-24.base.tar.xz 865892 BLAKE2B 5855b54e7ad2fe9fec353706d026b
21 DIST genpatches-5.14-24.extras.tar.xz 3844 BLAKE2B b11a8019a920d12c848fdc34514ed7352217e41f659bb7935c6211132897e8f948a8ebfd281b89e67e3993e3e5a03f2f32b0b4d3b73f5d1228e65812cf6cbeea SHA512 a2b757955740078aa3891a6a696bd50fa35606bfc6dac0e739abe2869d5322554417b4bfd6a989d23a2d31bea14c06294747578025ffac3d77e8a91ea16f4ee6
22 DIST genpatches-5.15-13.base.tar.xz 604984 BLAKE2B c674c2eefbc18f2a8d182fa95606714b9a74420d7a3ebb32138b714743f11a7c7b278d77d33747bd1fa1a46e8f8e8364a9238ce3acee6134f889fae267ab0239 SHA512 0741c183cf8def586fc17fcb2a44d81dd5494ac9430a5ca07d239079f41a7a24bb686406e0ecfccdeb8a38e33e99831d2b355d0e8e65e8dd2e30db5f4b0bbe4d
23 DIST genpatches-5.15-13.extras.tar.xz 3852 BLAKE2B 131550ddf5d1d67808b98040e88bb75d9020ee99b7907d0b79839a366c52e83c5bee6a322f12363ca0cfa9816d17b36002b5ace1620ef80b386ee8c09fd23866 SHA512 79fe958fcd5b3c4c7406374431e28a482b7512214c0ddbbf24d5f4a42e7feafb3f235f266b0023e666348c2c1888d1c678d726403b2f873d55991e5aaef4b74c
24 +DIST genpatches-5.15-14.base.tar.xz 639672 BLAKE2B 93976aee6245c420aa654981538f3dbdbeaa9898410d0ffef103158e3856b18dfebba293aba62e4adfcb0c402d803428637c7a7c7b78a6483b64ab816f3fe355 SHA512 37f506d21264ac54d3075890fdb5f6267039518f083961f13a1859e1c20a390be12071a95091d9b01f5aaff11623569f0bc663180e4b6741b765e64ff45af361
25 +DIST genpatches-5.15-14.extras.tar.xz 3852 BLAKE2B 09bb1bd3fffd353fe5454a033000632f9c76ede889e8550ddcdd507651e427e6b55fc65329ba89753b8b0d4e4bf4988d3c3e54a54cdf01e54b0e200d38fcbb68 SHA512 61bfb0e5d1f66b0b6b689c8e4474f22b8d2dbebd9233ea139c6da870cdb76c9a1559eb1469f91f4c3cc0eab5f2688dc7b843601ac10bf989bcdc3129510e06b2
26 DIST genpatches-5.4-172.base.tar.xz 4281140 BLAKE2B 438ad10331e709a85f1ee2a8907a982cd545579940431220f763b1f68280d007d344627b0d1cf4406e2a439b76d20497e1f4aa6d103bb5569f119bc5174c545f SHA512 faa28b056e48873b41b78b540afe7db3200020f85f1ae516f7949f3cef453eccae9b6b8631d594ba8b1dc1b4d6b55b1e9c9379c4880eb4697bed956b0217bef4
27 DIST genpatches-5.4-172.extras.tar.xz 1784 BLAKE2B 9d185d1ff33c56417bf9cfbe33efc6ce4b743a0ab9bdf419dbee14cde34d7c2d6d17884ace56880f75cc28a16b7e18a5e7b87f110c64bc7c84ceb81c7df85831 SHA512 cee6e49804ebc200dd7e308d2a59bfa0e381428caf69678bb6d406357a86398327a354bc2900096f82a77b47beea7fca7e5709cb390fbc1e0b7575c01d062024
28 DIST gentoo-kernel-5.10.88-1.amd64.xpak 65533790 BLAKE2B c0b944c638ea7a45846f679147918ea6252f8945021f4dfc4a4c656d3f2ce46c2e8727f7d4a5ace57726df88d23067d21210cb9b1a059ee6893d95dbafde90aa SHA512 f347e3b0a5be1110635ccd995a2c8f142e379c11a26a1901c988a86f57c8c50db285d3445321b38f11945585b6bcfbaafdaff6c0092f6ee189616a141eb65040
29 @@ -17,6 +19,10 @@ DIST gentoo-kernel-5.15.11-1.amd64.xpak 69061498 BLAKE2B cd7f5f572e66219998fe3dc
30 DIST gentoo-kernel-5.15.11-1.arm64.xpak 64032891 BLAKE2B 5bbbc1f3250261c6ac6a2029e8055e4af67fc47b19e47238def3b313d6b08fb4126ba87697c1a67f834f2b8a52c75ec7a1ff9be2f85c5518aa7a4a1026eba956 SHA512 0a10b84f2698eae6d8547938ba92beb6bfaba59b32da746782c693d1c88164fa7f2db27001d62577d87d9041dad9742439ed68523739ac1632d07fb3cddd9f0b
31 DIST gentoo-kernel-5.15.11-1.ppc64le.xpak 57833976 BLAKE2B 01e80f26cef7c5945f0c9f75d162792b3e91f390e714fde61484a311e8e828564accbe1274196903d71ca15ace41a6b8d06230a4092f2fd553c2eeb31a78350e SHA512 04fdf0baf55a5bc85464dd0d3ec014830c6d986e718718bd2c87fa2fe5e439dcc4a865557db5eed1a3a91095579d9ca8412553c1c4a1cc5c1626a1651c5a4c81
32 DIST gentoo-kernel-5.15.11-1.x86.xpak 59903241 BLAKE2B ab48b3cc11ac2a4aa1ff4c9b14ea96e3a34efb8941a6794448bc008e4db72d3dac77fae90aaf1e6bfd94572cab352bec77796584274e64c7be1af5746b558504 SHA512 cc70ee598386ec2cdb4abd510511ad880123e1fc22da3603ce6f9966c697ae32d3839b808c1c6c9c42b78e679f6504f8ce228df864ede08d07f55009d7ff1800
33 +DIST gentoo-kernel-5.15.12-1.amd64.xpak 69062572 BLAKE2B f1a54850481bcd3f181b4ef93a49a927e84b2f78ce79b2d2856b92dce91b4af545aa842ebbd6e6a60bab98918cb448350684764a9e9d44cda3af96f9512db833 SHA512 d51d7437d6f00da843e929c0546900f7a3191d9d7cb6efb4afbb2e85cf758a4e78d10d7404078b5823295b5e53a836d7c6e8b0eef0fcf5deb6ca53b4e83a05b6
34 +DIST gentoo-kernel-5.15.12-1.arm64.xpak 64053450 BLAKE2B a79e0d6f66f3a4483e5b079ddc62913de044c88977a32b46cb9bb390a65363592b003e14322c4ea96d5cd45793f85423623a82d1d3946efa28a61d8df2d30a0e SHA512 a0ba5ad7e0ec2af595aee306546f45b3b58dd8c8c2b502d1bf3c9c3d3aeb3cd9d6ed9b03fb8b0c6d660cc046c66b163a0f635f9a31238c0e4824c8223f44e257
35 +DIST gentoo-kernel-5.15.12-1.ppc64le.xpak 57918044 BLAKE2B 98cd1cb7f03e33d6e69f1310cfc199cb60597cf4a825b861b9d66390e34942d6252c87a16a9fcfbd0b5ba5e2f1579c2b7692ac0eee462834a2166c4e4c62da5a SHA512 b85a6166c4181658ba834dadcc0ac6a1f2ac4b3e0c38a430d1ecf8e4ae14a945d98ee12fa519a173c90f42fbcdb00598f72d22f3c646773f767a4a99fac09058
36 +DIST gentoo-kernel-5.15.12-1.x86.xpak 59900557 BLAKE2B 60a49d2aca7562d6e3a324925f1318917512f083a3037988c142c816fca3d9dbe0716176b4d3d7a1fe2d5eca58b13cd261b6d29c9bfd82dd973e4b4a09e4cca0 SHA512 c6a0c7689ee17769150941395c301d8441c68dd6ad6d87e2aee03c3e3662b022f6607d8d57f26a1474e0bfdf2f5ce0def0fa911a5bf16f6d50566c64b6416c05
37 DIST gentoo-kernel-5.4.168-1.amd64.xpak 61384671 BLAKE2B 8097b6fde83c1e607a04ad2deb91af06a29fed92a0262dcac3cff54a0f46677664a7e5eaedadc2b56b8aec58baf037c4afe2e89d9235a9325bed2177b1d16784 SHA512 a954a1dbbd5f4f600be6a9540d3de48c5ede39fe1216e278ed43180edbeab648ef62a230711912b3f4d756ec31c4b6f20c8642ff0749a8e3c70071e35983ecb4
38 DIST gentoo-kernel-5.4.168-1.arm64.xpak 57633627 BLAKE2B f5e6f9a4105b358b01040d947ffd32f56b7a8ee7cb121be22ca1785bfc3ebca3a75a396093f1b7e1a560931e8c8d9c15dd63f73cd8a78c9b6658360390ee6217 SHA512 707148a9f1395482d5752c1dca293056f989415ab277cd7e33bd540c75df71b42cae97c238a40dd411a168e60cbad340ac48ecb037985b3d465f1dbaaaf3b57b
39 DIST gentoo-kernel-5.4.168-1.ppc64le.xpak 54973828 BLAKE2B 825973a2c3e2ba373ec3085bc7dfc8a84ed2f8e8950a5a9307c9f732d1fe2defe0a9152b51334b87e36ff43ab95af9158b38d1e008fe7a34f2bf5cb1e4f05a9d SHA512 a6eabb0b08d3309d6ea0133048d6fa9d988fdf2e5e0ff2beebbc40df5c6b76256331862b499e079d3f550b0f8bd9539592cd6fb4c16a01efeaeb6aa9e8e3a7e5
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.12.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.12.ebuild
42 new file mode 100644
43 index 000000000000..cac156079420
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.12.ebuild
46 @@ -0,0 +1,126 @@
47 +# Copyright 2020-2021 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##*.} + 2 ))
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 + # strip out-of-source build stuffs from modprep
164 + # and then copy built files
165 + find modprep -type f '(' \
166 + -name Makefile -o \
167 + -name '*.[ao]' -o \
168 + '(' -name '.*' -a -not -name '.config' ')' \
169 + ')' -delete || die
170 + rm modprep/source || die
171 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
172 +}