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, 12 May 2022 16:35:42
Message-Id: 1652373314.47c47d48426691ed6b018646652d3f16a18306f2.mgorny@gentoo
1 commit: 47c47d48426691ed6b018646652d3f16a18306f2
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 12 16:34:15 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu May 12 16:35:14 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47c47d48
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.39
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.39.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 73c73cb402fa..a8eb9434918a 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -18,6 +18,8 @@ DIST genpatches-5.15-41.base.tar.xz 1716640 BLAKE2B d2a37f5bdbb541bad670240ee6fb
21 DIST genpatches-5.15-41.extras.tar.xz 3868 BLAKE2B 11487f062c49431af029fadde1f01a95386d42e1349a658bca314bd26d356eb82d0292ca68ac34d4ba4593a25d7422458a7dcf306431dbe46e68c9306bd8ec82 SHA512 3153848739687683f02c65d1dc87b4aa27d0fead27ac9fee28acd2f8d0fdc118473445059bf756650512c5f3fa79b8a4a70882c2ab2d4329c4d7aef982e5e4d6
22 DIST genpatches-5.15-42.base.tar.xz 1756168 BLAKE2B 953621740d74dd84876e46a3ce9781cd5df8f7ab37588e386045196af57d8d000b120b810b762ecb9d52729e63433c0dcd8b8fc2d938fed05c33705bca907227 SHA512 4f45522c7dc0e5c1b9289cb09199f640c2bc124fb306ac64e9de1da56de123b118445648dafa7d3170e1c8a2607b6ab1d34dbde4a3c1cf1ff7d21d932a9672ea
23 DIST genpatches-5.15-42.extras.tar.xz 3868 BLAKE2B ec9eecf22597ad8217a9fde77067bdfc3e7e8bf5bd502ca71750193d8353b51e6371b7323b66afa8dbed6a177e2d165a2eb2eca0e06d2943b474ab74a5256834 SHA512 71155d6b1130fee0484b0171f72d2f627b65cad8a02d5047de9d180ed01c2002958020961c925b4c0b6a415ecc2cdc481c4820dc1f9f8a8443713a6a21c3a022
24 +DIST genpatches-5.15-43.base.tar.xz 1785824 BLAKE2B 435e3a48c6d8b01d71f203e7373ca44b03794f7ec5dcb84cf919b0b0cea0fb06edadc4228b0c53cd71ec6b80f7a0b2040e60a3223dbad0d9fd444e4980528ad5 SHA512 b78e665d7e43f5de92f83e9d464da953aad3136dc35a63cbe1a5f098cc8133162cb5d47a7e9cd323d86f5835194c27daa48a648bef4e6fce29d706e5be33a0c8
25 +DIST genpatches-5.15-43.extras.tar.xz 3932 BLAKE2B e6ad29d61c10175e8e31c91edbef3056922aeaa50583c64770fb1df714dd6764099b213a85c109d1057bec95aa5bd4485e8dcfce196ce7a6a0bbb682a7475965 SHA512 f85e4a409d4240bbb17ac3e3ca38afca1fa1a3ff8b31e9e2f7b4d5dfe6a255be38073f3e2dc02657bc309229281862d066851d4f57cf7213d8500c7efe64af8c
26 DIST genpatches-5.17-10.base.tar.xz 649500 BLAKE2B f92a3b4880da7a922694efc984e9dd711288decd2c3e20476036e59a09179b99250ce03a3471acc69d03d361ace416688280c5577ded2188575fdf731504b625 SHA512 b068dad762faf36618a06f245097b4f3752af2ac983afe73b673e7d34e39cf4cfd6c2a1afaef4178317c199731b522bb3037be01b737db9e6ba344551f7f9dd3
27 DIST genpatches-5.17-10.extras.tar.xz 3800 BLAKE2B 547c378d7326c7a3f5f8f748ea440e5f8d822e36fceb7966d9b8a2dd6370c645231c9b6b73f6a92d60324cd0fa1b523f7a3beb88701f4424c4d89abd669a054f SHA512 0290d3ca272624ed230ae5418cf31bc846a59cbb9c0657209f7f2de4af447265aeea58c08d2f0b4ab2f25624230eb4f64f82723f4019c903484fab141ba12b46
28 DIST genpatches-5.17-8.base.tar.xz 558192 BLAKE2B 8135b5dbc28154d346f1e24d915e1d80098764186a28638a147d3f840c431c7a44b00f80166d1acbf4181ce295c2655be4b7939919158ff2fd65174bba7bdd7d SHA512 3577093fa8b8961fdee9e52e67c0681055f26db4e5861ddeba8146cab3e63a1ca97287114feb79deb8a82518d7915cd213af01c18735207bdb705985f276dd5f
29 @@ -74,6 +76,10 @@ DIST gentoo-kernel-5.15.38-1.amd64.xpak 69302818 BLAKE2B 7fdae608b181985e130f2fd
30 DIST gentoo-kernel-5.15.38-1.arm64.xpak 64206632 BLAKE2B 2fc5e17d2220c28b0c686dd81bb5b708287736d4cb4d190d64fb47bdb83f76cccd6a9b1157a5142658f0f86cf79e44a3b84f1a4e54e9563190794ab0dcb71365 SHA512 f55423f5ab1c98a36a2d6cd5a0cc437e0a75cf3f67366020479a035c86fac6501d2eadcbced3b1f524274e5ce7f2ae5eee00e4e12df0ed53e912e61b149dc1ec
31 DIST gentoo-kernel-5.15.38-1.ppc64le.xpak 58014095 BLAKE2B 7920292927306b29e3955b5ac4a94f6a44e32cb1f2e367b71c3566bb2d473bbdca24737b0eef460880780721ef4af869bd054d648e94ca2c02dca41faea41f18 SHA512 4271a6a2b211057f9bf5d9c7f66cf7afda04f93ffe8a0f1e91baff85d25a9c6e65eca5467a281e59eb376118ddda567babb7d7557f80dd46a098ecfff5499d89
32 DIST gentoo-kernel-5.15.38-1.x86.xpak 60036854 BLAKE2B e15149079c8146c661a917c463657d4de86cb574e6b2374ceda7093ed9948aa86eac18d1008465e3bb838c46526d96d4e2c0360f79bfbeee6b313d5adf764a5e SHA512 d645325c3abba8cc98ef406eb8c38f899e9f940b135ee3cbdd6aa54854e821c128c42208032b7cb3e2c74b742bf8c968f29be855cb0bf7c8bbadf0ab6522e2cc
33 +DIST gentoo-kernel-5.15.39-1.amd64.xpak 69282147 BLAKE2B 8381f051a8804ef57900303ea9447c88eccb9f7d28eaecd3cb155d7ead79694a0bd1432a306fadc8dd9c4e73d1f65239e574d5245033b7c90b4c5de03c498a96 SHA512 27fce87dd2f189912f8bf861e2eabcacd79dd043e3da0265e00d42704eb6e62b9374b7231059e6efcd2c9b4569b448aba035485382220df031cb940d6b9c58c6
34 +DIST gentoo-kernel-5.15.39-1.arm64.xpak 64211676 BLAKE2B b23a661108767c8592988ef4575fbf02c4cc4b42d999c91de31c2651246599185ded9560242a8ca2d5dbe99d91323d6d3bbef1ce88a7b907ea664d87af9898fc SHA512 7405e20b84a3be16a4dd977b8aa86afd336534a88d2d1b41941bdc6863ca19a05038fa3a63b80c5e099fa7a2a08b02f28f537821289c3a18da23a21d4ffd1027
35 +DIST gentoo-kernel-5.15.39-1.ppc64le.xpak 58016132 BLAKE2B 881f9ee8bc2c46bfed16afab4791943e3f8fe1a35f91a239c1c7fa7c169ac1901298540c775ab08dfefb438bebf566fdfdea29a3f96c599e33e449a0f8a48ad6 SHA512 c09daa6d80d7176bb7493a41ba38429ed5f4952a8214c760af7613eac95656e3308249eef7e03a2a3aa6b7021809e1b923c386a8c3c9969ec0f2edec3c59d30e
36 +DIST gentoo-kernel-5.15.39-1.x86.xpak 60035980 BLAKE2B d6864179687623a55192e4c5fc0419da2c936bc8d66f69b0dce4909f8b06f70cdd12316ebb83fc4d4a805089cc6ac4918432464de1b1ce6d0d4276e22c059006 SHA512 efe793f9dcbc103d55fb9a8522da19be19a83251e0308e7f778423e896abc74da1e1062117dd90081c3f8182d00617844b85e04f34cfebe288760f583cce6ba8
37 DIST gentoo-kernel-5.17.4-r1-1.amd64.xpak 70430680 BLAKE2B 8f246d8b11c900b9d090f4fac263d0a054a4bfe467f9f28abd416a78581d5fc89d08f6ade95f82f6bd182d7cef98b8d243f3d49ccfb141d0c61f7e583bd6acfb SHA512 cd5c00cf9edcad010187f6f8b022db0b3c52feb48830b74177dbfd0c2a1e901e125250a9a203b70dfd252677d1f944a25bb2e09ec1954239eaecba324ed64e0e
38 DIST gentoo-kernel-5.17.4-r1-1.arm64.xpak 65839972 BLAKE2B 36731d61f9f4a105123e367c24a8e902d1d48cc19c4414a72aca928ec4d96375720ccc45176d486849e80b4688f4cb6860acc2ceaf0aff479e8a75a3d62d857e SHA512 6ffaf431b0ac41713437b9ad48b9e15d91757c95fc0f17d8f08d92e931f3bfd9d57d5726c56d98022aeabc8358c1e7635a6992ae317450ab556549b03f0b3cbf
39 DIST gentoo-kernel-5.17.4-r1-1.ppc64le.xpak 58851867 BLAKE2B 0c0a974aabc5f147608380cee73642ee6ef0bf9c7f92c6b743d44d0a9444abb2cd13d1e8429ed3b0245d909cd0705564d83edae66af6bc1ae111250b20bc9f47 SHA512 e5ec809a2454d4668bf66e77b5281486ecb62c56012756e94fe48de06105d99a52a9187a0dc807a2bac44ac79dd639b09e85ddfc6d82922a6a8221c8f64b9bc6
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.39.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.39.ebuild
42 new file mode 100644
43 index 000000000000..0787e9b25ee5
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.39.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##*.} + 4 ))
56 +BINPKG=${P/-bin/}-1
57 +
58 +DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
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 +}