commit:     f1a3e2b1fe7bebd8fc15d76a13d11f17aafe36f5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 10:12:49 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 10:14:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1a3e2b1

sys-kernel/gentoo-kernel-bin: Bump to 5.18.10

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.18.10.ebuild               | 135 +++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 6a679f733e26..be26012ffb9f 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -28,6 +28,8 @@ DIST genpatches-5.18-11.base.tar.xz 547804 BLAKE2B 
d0550c546e93b806d96c8e64c5ea9
 DIST genpatches-5.18-11.extras.tar.xz 3924 BLAKE2B 
de48f32f46f5d8fd8cb607490eae51338e6e7e94501e2e1ded2c990274270d80c7a883ed227203cb7306c0259f8dbe226ca3ae271eab76e367eae0ca7bd653e0
 SHA512 
bcb9190ba00f1028ede7ec7c18615260d8de263f508cd9c543938c6dc0fc9b0be856be386af4a86770562453e094e1794fad064baffdcb4363cb128abb35fa75
 DIST genpatches-5.18-12.base.tar.xz 549680 BLAKE2B 
d6973dfb0d7749fadfc511b1092dedc67b3f8a57e2a117674113f43177bde8608b6106c4c84fbf5f5a161b9710cfad28a3c2fd419fb3c4088d98f9a504ae0cb8
 SHA512 
c7ad63058bb77c92d3ecf618a41164476a56f2b7b879c667c7fc9666fa1d7f81b599d6ffc5f0fbaa3223e7d399dbb6348ddd511598581083f7b78d505dd81e7c
 DIST genpatches-5.18-12.extras.tar.xz 3920 BLAKE2B 
89642c29bae1b15664749c11e581ebf1d0b42801cbd3e436805faaacc419fa7d946a05e7d37bc8d056e36768d181b2e71dfdd6b28943ea112dad9f17a9c2bde1
 SHA512 
301cd52af9db5a8ec91891a0258a262261d87cf22cb01c27a531d0274ee23d0e928977abe8f5928d3dcba430d032a3cb418193bd1f3e09a923ca6e8718ec7420
+DIST genpatches-5.18-13.base.tar.xz 578484 BLAKE2B 
03215db005e5a3668898b1ac4c25aeee5f20d6802d00b11d24d41f506ca9f730f031f5cde187f81406a3c75937d65f854acd3c0e2d2cf9f9cb3ba99454304180
 SHA512 
bdf29085cf76022aa21faaee63033e3231b9757282633eb5897717128bc340cbf38b12a2918b169b452e85aafc9fadac2645df414f877f43950a3147e00dea68
+DIST genpatches-5.18-13.extras.tar.xz 3928 BLAKE2B 
21db8944e961dc054e69901d711a85d2965bc90dcdbcaac4d939e033d7b2007860f594e7bd3decdb5b2ed73b0e6b67872dcbd64a3301fc106cfd1c9c189f071d
 SHA512 
21fe61063d2e4b3ff40664d700643693068aa73d1d5416272116001c7f4ab6a3c006824ad868fd4185fc20fe53647727874e7fff01450d5f5dc36aec84a6e55f
 DIST genpatches-5.18-8.base.tar.xz 440848 BLAKE2B 
8a965867409cc340b13687eec9c7391bbaf26b770ba8d4b657b923226a539b7b68eabab6f12bae4bed09a0d198917373a6ab4f707831c652e2461a49f8dd4981
 SHA512 
057a00d62f4d8ba7be4ea26aeaa4bfbd5581b22ded85dae71aaa693621eda17532ac00bbeaaea1689f552ce2b95a04e9aade603f6236c2a265aa8fea8231c5d0
 DIST genpatches-5.18-8.extras.tar.xz 3924 BLAKE2B 
3f575b12166621c67c9cf6ee15a76af551a039d142a85678abc10829e9a573641be8557b9b606352d46fa4d123e95071b2946447a6f53afef5b37eec5f342cf7
 SHA512 
7aab8d9d18dfb6129ee0e995450c9d9d759545a9fa2cde1d26dfc03d677b9133a310f3943cd77b5981830a6a1cff59463e85759ef5cd68bcb2838dd96104f590
 DIST genpatches-5.18-9.base.tar.xz 495452 BLAKE2B 
244e049522e9b8586081b9eac59fec51184c532bca70fc1d451af1ded646df9bdc7e047cea0963fd07ae8aa04bd4158d64854a2d790ec90be37aa467c7e8b646
 SHA512 
b90abf747ae92bb4ac7ef94646aedc21a89080d10f8aecae63821d59c0ac29b3b94c0fc6b862d87eb8b86442c2d41cfe16e3a1341d3c146d2b3c678c2f2cdf9a
@@ -92,6 +94,10 @@ DIST gentoo-kernel-5.15.53-1.amd64.xpak 69321039 BLAKE2B 
024e794157d79df67f33cb6
 DIST gentoo-kernel-5.15.53-1.arm64.xpak 64182672 BLAKE2B 
ee3c30067c57a610fbd5ce8baaaba797698e0424acf3457a790510ff3ee3ae2721abb4087ece0c26aa20353fd406dd636dd6bb4634c9b0b5e6c94b00c7423c1f
 SHA512 
b4a59c7fd14cffc2804fb8182159a15e66057b9b8458a1419fe25e97a7621546d62c1d862988c783a52ddaaf7d9d56950d235971eee444390a975aaa92bd8a9e
 DIST gentoo-kernel-5.15.53-1.ppc64le.xpak 58081516 BLAKE2B 
6adda05226e823ea36347eb28b624b477bbb6b3e5a88bac28311df279e7d2a97d0c8758262c555ef8b08dff92ffbc6a645cfc17d4b5774172bb717b564d9d99e
 SHA512 
262a4971395eca750a84c1763cb022eda7ecf3fe812a316fc94801bd85746e44e0c36a6e92de8e344a613e00817a138352a3ed8d6233b8953945f01025bac27f
 DIST gentoo-kernel-5.15.53-1.x86.xpak 60090117 BLAKE2B 
ea84dd8ec9876c489f93f68bc3691f1ba7f61a3f6d98903af35370c8ac9336c26e77e0f07892c06918a10b0c0327175f042b113560a216aa731a16000baa4171
 SHA512 
f071106e07fa3b17355979fc91c6bf360995b555e45e292b530e6a11a4e86eefe447b7152ebc5e50f6c973fb0b846346793742e1e125e1220dbff570ce24e3b9
+DIST gentoo-kernel-5.18.10-1.amd64.xpak 71603500 BLAKE2B 
8a0d80fb825ae370cd28f587cd31b4bfb8bf4a679848abfb5c201738c75f0030deacbe77acb1ab367260bba8dd0aa69c5be691857e48e1424b98493ecb5ecd81
 SHA512 
10460c0153afaa9dfcc5df28e39e6a3b224cd0b614df977c5f84bcaf147178dddff5b4b7524b5a15b36aac873f7b0ed356dfd0771920cba1da7f0fee48144750
+DIST gentoo-kernel-5.18.10-1.arm64.xpak 65243483 BLAKE2B 
ff8b7846d93f4c57c54666e866f27f8a5fc11f21d546f8c028124e3f2508ee4351f4a3cd75cff254e0cb49b0888ef9ffe6e3affc9f7146b3cc565cbb08edf59b
 SHA512 
aec1358fff66b30c484be9b914f3ce2bf3ef88f41de71d717a5279a4df09aced85275255d9af112e54d4d71b827fc7cfb7b6a4383fc3c2024a72471ffff1a4be
+DIST gentoo-kernel-5.18.10-1.ppc64le.xpak 59437353 BLAKE2B 
2ea2d838fbfa1e72d9bf056c627ae983ef75ca1c04a3656282a4e6d701fc0ec65d46181fd4cb513e8ca692ed92bd01e3fbad4a3d7e3e2a3dbf9b441596289882
 SHA512 
999791b651b107f50b0a7262738b61c39f540b17e83edecc3616e6f8f73454ec8a10fdffe14358aa791cb0c98fd5365e50118edf9db8b31290d81f338bca9f80
+DIST gentoo-kernel-5.18.10-1.x86.xpak 61801218 BLAKE2B 
ef095e8409d25f4ee1be443a4b1800199f6471b0f06518c122777c19dde1488f0e6a5a1ebd9363f42a38d7ef9531f45e3a002e1f5563318c6d1710831dfb6490
 SHA512 
7637df3d5cf4f8a952ac9a9e664f7ffbeb45aa90e3f1defde4933a2a08243096d27a45bad942bf3818deec850e8a285f705ccfc293225177dc93b66a7ef154b9
 DIST gentoo-kernel-5.18.5-1.amd64.xpak 71624251 BLAKE2B 
906903314080f075709b091cac9471975a7af4833e76a6ff6143aad4a1d4e3bb258a350e15573163eae0a018df917c965cca1d35404c2cddb7777a2a300fd345
 SHA512 
eca0e7978e9e214d3d18a9cd78ff62e9ec2b1c320f030ce45996743cb809a1072cffe7680065c7f8272eead9c9ff25a04e956a9af53f9ab2013a4a12a5660b5d
 DIST gentoo-kernel-5.18.5-1.arm64.xpak 65223184 BLAKE2B 
9b54ac0556c6515a9303f6c636cc32c78c8c2b5a0afa03ee7f1ab627a6cc51847d2e606d4beedeb0373ce00d87f7b41b49c8f6173d9154721113051e6b335f6a
 SHA512 
109860d371ddfc7f17c3ff0d41e683f9adf8213aa880f8171e212b7d5a4109098f6ea2cb51355de0622ace8c3c69f094ff12331f230b618d912e85e4b1944f4b
 DIST gentoo-kernel-5.18.5-1.ppc64le.xpak 59550570 BLAKE2B 
d22a29421f489f9e27018b166801fb039b7a7c58e45efad3eb2841a2e9bc2e554da116c469db7ac0845debd86969ce975ed5c5a4392e33aa8b3a626882a52fc4
 SHA512 
005450035299a52699bee929bc7135a25536f633ebf23cee71ef771760c93104fe8ea63016e367fa7ffdf7d1b42b8f173b8a87c6a2aed7b868ff4bf35bfdf767

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.10.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.10.ebuild
new file mode 100644
index 000000000000..bec229c85248
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.10.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI+="
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+       amd64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.amd64.xpak
+       )
+       arm64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.arm64.xpak
+       )
+       ppc64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.ppc64le.xpak
+       )
+       x86? (
+               
https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.x86.xpak
+       )
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+       sys-devel/bc
+       sys-devel/flex
+       virtual/libelf
+       virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+       default
+       # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce 
ppc64be binpkg.
+       ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+       tar -x < <(xz -c -d --single-stream 
"${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+       eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       cd "${MY_P}" || die
+       default
+}
+
+src_configure() {
+       # force ld.bfd if we can find it easily
+       local LD="$(tc-getLD)"
+       if type -P "${LD}.bfd" &>/dev/null; then
+               LD+=.bfd
+       fi
+
+       tc-export_build_env
+       local makeargs=(
+               V=1
+
+               HOSTCC="$(tc-getBUILD_CC)"
+               HOSTCXX="$(tc-getBUILD_CXX)"
+               HOSTCFLAGS="${BUILD_CFLAGS}"
+               HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+               CROSS_COMPILE=${CHOST}-
+               AS="$(tc-getAS)"
+               CC="$(tc-getCC)"
+               LD="${LD}"
+               AR="$(tc-getAR)"
+               NM="$(tc-getNM)"
+               STRIP=":"
+               OBJCOPY="$(tc-getOBJCOPY)"
+               OBJDUMP="$(tc-getOBJDUMP)"
+
+               # we need to pass it to override colliding Gentoo envvar
+               ARCH="$(tc-arch-kernel)"
+
+               O="${WORKDIR}"/modprep
+       )
+
+       mkdir modprep || die
+       cp "usr/src/linux-${KPV}/.config" modprep/ || die
+       emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+       kernel-install_test "${KPV}" \
+               "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" 
\
+               "lib/modules/${KPV}"
+}
+
+src_install() {
+       mv lib usr "${ED}"/ || die
+
+       # FIXME: requires proper mount-boot
+       if [[ -d boot/dtbs ]]; then
+               mv boot "${ED}"/ || die
+       fi
+
+       # strip out-of-source build stuffs from modprep
+       # and then copy built files
+       find modprep -type f '(' \
+                       -name Makefile -o \
+                       -name '*.[ao]' -o \
+                       '(' -name '.*' -a -not -name '.config' ')' \
+               ')' -delete || die
+       rm modprep/source || die
+       cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}

Reply via email to