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

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 65024fbee9e6..a780bc83025a 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -38,6 +38,8 @@ DIST genpatches-5.4-207.base.tar.xz 4860968 BLAKE2B 
66c74dd8794faca08608b12616e2
 DIST genpatches-5.4-207.extras.tar.xz 1812 BLAKE2B 
53da29109cf54563a505ea1ca636d5762c2030cbca87c3634efb2c0409345962f91be465e1152e9ad7c86e0def9a509574a90ad5316eb680bd451640409502e1
 SHA512 
f199548293ea31c20ddee22401afa48181ba5ff29a9bbadf6e6b70f3608efa94e2b2a8c1b82eaf921844bb3b50d5bf3be01f94d83218d821709dbda144c22149
 DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 
3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e
 SHA512 
880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 
3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991
 SHA512 
b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
+DIST genpatches-5.4-209.base.tar.xz 4887256 BLAKE2B 
56d7ea7975b228df055d1bd4cfc41b49890d815409a159772230c6e9d081061a9b438b525b5e8542eb03feb0bdfc1841e5bc5e14dd1570aff8f964862b192b00
 SHA512 
5ea69d50d836dad1f68f000c6c1f5bd8459dcbc4d50a4fbd4ba3241c4c87638850215c0207dfea6fe06cc596957e3cfa61a3dfc00f0b60513596da43d286615f
+DIST genpatches-5.4-209.extras.tar.xz 1812 BLAKE2B 
c1cb92a600e0827b133735f3c04a98e608f5dd0b69f53b3bd64ae03d8ff7b0189b0e00027ca073c4b80a77cc23f92ced5dc4bd4fd5912b538aa4ed3131d49b9a
 SHA512 
8046b24112d6635f76cabb7d8e429d9859553440f80fd67152f051fddc6966ddc45e4a465ee946439c23b887282f5517ab12dc7f1862d5471d2815911a4ee2f5
 DIST gentoo-kernel-5.10.123-1.amd64.xpak 65756021 BLAKE2B 
18bcff8a26baa8719d3e91812f636dd543e15e7d524a049e16ff6866c61b3bb03041a63e0b95cd61df977e8551876a3a67da6826e3084daccd9e191ecc158651
 SHA512 
6248593ec6f822f3bb7e20332ff7d9300e2e1246546db5555685fd7e0e77c756e9725f73fc03043b8f817541e177a1a20fe5212d3cba9d2dee05adca4b1bca7c
 DIST gentoo-kernel-5.10.123-1.arm64.xpak 60973935 BLAKE2B 
440f9bc1812b1ff465587c3ac5694ad488eb8ac55355d11fc2db78682439260a3ba3252292a5abc26134ec759a3c4898bf744276cc7f8ff369bffe63de5ac66a
 SHA512 
ccf3141880e34b665ffc613b2281a618194a4f319c8b8485429e0189f369f0a2498ad55ccb0dfceb82e23f447b5f11b6a3a9a59c62dd38991d37325528fadfc3
 DIST gentoo-kernel-5.10.123-1.ppc64le.xpak 56011478 BLAKE2B 
5b7d540f05536e15f0efcc3af1a2fb774fb0f4beb68e1076c845337491b955692a83973bdc478f7862e34560f0eab63fc0865fa6014736af1436a4732b4f44df
 SHA512 
f07f595ad0e65872121e2dba9c0da37b28db094e1d7904d5622a8dfa963e7593107261f40d5aed1d5dc1391595c9c44ef4931c78431b8e5d4593230793692bff
@@ -119,6 +121,10 @@ DIST gentoo-kernel-5.4.203-1.amd64.xpak 61567440 BLAKE2B 
7cb004bf0d90e517a1636e9
 DIST gentoo-kernel-5.4.203-1.arm64.xpak 57698276 BLAKE2B 
2bc0a4eba7ef829a4e705706b7ce33496b8a36d33f0808bc315df45b9d7a00e6aabda71274956b484d394f3431bb22be118c9b37711bd5cc74d6d1d6dfa0027b
 SHA512 
d4849d69a3a6134d260945721b164d74604a4b2e590d1545f7444fa9cfac4f7d8419b8d77dd586c87a52ef4bad3620810993a7161083370e2438b9723f249d37
 DIST gentoo-kernel-5.4.203-1.ppc64le.xpak 55132763 BLAKE2B 
bfba496c86aeb1c0e0826e8222e60fa96a0c57b0b66af485c619eea277ed64fe590ffe0c7932da36de2c2f180772ec6dd5d1925bbdca3d52ec2c9e0ed0808113
 SHA512 
e598776a8d6cf90d6a92f12af3899a28eca53fe037906c0de5e57f5b8a128fdde98d9453b06e0796d4c4b8d27b5b211db1aa777a0f1636b4cfe73e26be96d9fc
 DIST gentoo-kernel-5.4.203-1.x86.xpak 53304279 BLAKE2B 
3954403be6b7afb2b9f7e27532fe6a49d240243d8ab04c6262fdbf864e15c681c5ada7bbc44f8255b6a621683ed7e77446a14bc2712162e524c31636a063841a
 SHA512 
e3923650e5bc15a1565f394495c8ccc9e715b53f9c45836bc38be09b9f64cb61a4672cc6163e6a313654d33657890ef6fa51b51475ded3a29763ee80c2d9b13c
+DIST gentoo-kernel-5.4.204-1.amd64.xpak 61580136 BLAKE2B 
0ff31874ff35df3aa4eae56af5b9801e9f919a2d8a5e5687d423820c314eb9cc181e3608de11415814d328c52e835efc0f0edfc75ed20ff63a1e39012c69edfa
 SHA512 
514ed8fd736f329f01f32fd07ff4618a2b841fda31489adda504d134442cb25ac341f0514ff30738bfff8330984ebfb0c1302b7db77a581202cff2f7f08ce8b7
+DIST gentoo-kernel-5.4.204-1.arm64.xpak 57691500 BLAKE2B 
0a3117a6eb7b52062ca33db77039b569df80564de861c8a6d3879b40a3763ee782bf2e4dcddec239fe576a503224cd30dafc44bd512eb1ac79cccfbe908c12f7
 SHA512 
1ab5b66f0930ec5cd41d61e359fba1fdd9d71b8e4f0a61b578a196dd36cbacb5621b5a710efdd359b4317cfad14072d5088132d87ef3b21d2111aaf439a00a22
+DIST gentoo-kernel-5.4.204-1.ppc64le.xpak 55145574 BLAKE2B 
a3d2d691959143875c7b13e8a398af2f38417fd35c555137e649ae0ec622e6015dcb21d4b82b969b4b00aa1b452a9a6099180c500d706feed33fbcee2f5b3ca2
 SHA512 
a791b8f4036f54abe62397532f41f18edb2f4c3c85741e0dc2e165b0a5c8c4d3b723d685887cd435ca83b1ad4e8d526dd90062ab4e03d003049ed1930bc20985
+DIST gentoo-kernel-5.4.204-1.x86.xpak 53305740 BLAKE2B 
ab5d481fd297c12a17e331bc15b87a42d2f0c38abebec5a53c530cf6258e5617a49b70c85775125613554cbba94a07bdb599868ea06f45c45731b2365fa14155
 SHA512 
a4300e3bd5e548297c97b73742be46882d0306a14b7b12784ce076b16373d1257e49551299c727ac09c4065dd64029374bd0f8e2a0da1b670ff04195832bb4b9
 DIST linux-5.10.tar.xz 116606704 BLAKE2B 
b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1
 SHA512 
95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
 SHA512 
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.18.tar.xz 129790264 BLAKE2B 
e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb
 SHA512 
dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.204.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.204.ebuild
new file mode 100644
index 000000000000..b6c3ce9ca64c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.204.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##*.} + 5 ))
+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