commit:     b9df97b44169ce0af399e6de37040b1e19389ecc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  5 18:07:37 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr  5 18:08:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9df97b4

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.4.240.ebuild               | 127 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 8669babc1409..863291298771 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -36,6 +36,8 @@ DIST genpatches-5.4-244.base.tar.xz 5634292 BLAKE2B 
0ca2eb4409ae3a03f18601be7670
 DIST genpatches-5.4-244.extras.tar.xz 1812 BLAKE2B 
a8a48897765d7a3a80ae9ba0bf9a0557fb0335f80046c6003d35303d18f1b27cd4819caf5be67db19573fd67080fd43afda67bc46d10850ed6e71881b6218446
 SHA512 
7009108d6dd5b29e60382f4bd5a4e0a190e726e9e0d2310cd67dc7fe86bff0c9674d04f34eca8006518c47f73bd2e6b1d2f7065117252fe34d90ab44b339fcc9
 DIST genpatches-5.4-245.base.tar.xz 5632788 BLAKE2B 
bbd772e16968cdd010c71002af87787eececfaeb0ba02d2ccb9a18d046c4c7b05eabc62cdfa2ea05943533ea961a7724deb75b42ce006ce349056ba73a9f1b27
 SHA512 
45373b2cc4da5286a2bf3149cb7ca18aaf475b13e64471506815ff4665aae7e73534f68f13a350b8616631ed6677ca65aee0dccaee436339e24786aed022b09e
 DIST genpatches-5.4-245.extras.tar.xz 1816 BLAKE2B 
fc61841df1540f85577ea31a34b0b352e20dd54b02582e0379d46d93c7ba8b92faa0dc988dd906a8c250c8c325959e326a64188e97b4cb02d393ed8b88f2d03e
 SHA512 
cc468754c82833aaad28e830ab4bce06ca0d2422d91a603149bbabcb012b9d4861f91226dac924407573d0a46df0f03479811be448b2c37971e3e8d757c6f89c
+DIST genpatches-5.4-246.base.tar.xz 5659072 BLAKE2B 
4b3f836c7e9f7f4d1cac0c735bbbb7751c0c165c826cbf549033c9e9fb85be3ccf45d480b0c8d80f7d980daaa1fb62265b600e24dee320673434333bec891e0c
 SHA512 
029102ba3170b99836ddf5e4a9a7101826eae3dcced431a7049e4c025ca6057f694c66f67a20d5b08a124275ed91aac3a0e1060ca2946fea54d68b251e61b478
+DIST genpatches-5.4-246.extras.tar.xz 1812 BLAKE2B 
78297c82519cf71230dc19d674d345cb40d8226adab6af53c0c3af7239f7a1464b8c89b51b62c509b33e8b2eb1a8c102b10146a8a6151ab5f069a1e00f8f6f8c
 SHA512 
13aa1321f559e01257926ef94dd023222c2be9225bb412424a4b4696c1e6d6abe3e7f29c375836e1f9986d496df89051a60c34e8f8070aa0bd556683a387e356
 DIST genpatches-6.1-14.base.tar.xz 774040 BLAKE2B 
8e0866c762e2711b766cc75630d66c7c46221bdc47357a903c7e8506ad122b7b5ba84d102b19743d236ac5579b44d24f77b9f52f3c23695ab6a279cf7875e735
 SHA512 
6a753146013baf0b94d83abd690118517679d4d7dcf6e9f86cf8de35e24f80a792e9c0692f237098671c316d046d6f65f8d3512255e572daf6a8ca81853beca0
 DIST genpatches-6.1-14.extras.tar.xz 3804 BLAKE2B 
7f016579b130c9a4f7a8ec946254dbd682f22e5654ae777d11b265dafe2b177a4c40c5a979a760a5bd6ed3dac057b90a3120c60b958f6b748ea4731b9a5f1ea6
 SHA512 
2807d359459dd11b9d3356fcac609dbfb8487e8c924cc543ef37698667b1c8b74cff7b015839ca0677cf1f96b566e0b5018c057b517275886ab500cd2ca49653
 DIST genpatches-6.1-18.base.tar.xz 833216 BLAKE2B 
f1b86487c82d4354347171df635192a6276a4d0a9561a415270a85caa46401e4b9089f847346cbf441f8c6a4d4012234d83b31fca5797cc6296010f225392990
 SHA512 
155207127c1c58b2497788d5b7541ba1872fefea3d2c7804356e5bb6d28dae2f0400dbab44cf39b847f89e7a058710b8528059d75f0e92b63d3d37fd0a515ca8
@@ -132,6 +134,10 @@ DIST gentoo-kernel-5.4.239-1.amd64.gpkg.tar 60508160 
BLAKE2B 3761ba6409c26e700a5
 DIST gentoo-kernel-5.4.239-1.arm64.gpkg.tar 56535040 BLAKE2B 
cbd23351498d68d4265901ef0f02690b5053dc80659e1c3024d7f09e68063c0a1d6b2e1e521147a5649a38f6210f2d60b1a3bfbcff5d8da32a4ac60fb8d2b41d
 SHA512 
a0205d44bbb0b0e348e59b119f8eddeb6744e87ecf71558629f6b09b2a9bb814cdf91dbf36b0abdf9d174c7f3628dac3df0f61743761aa1cc5b8eb9915ab6140
 DIST gentoo-kernel-5.4.239-1.ppc64le.gpkg.tar 54200320 BLAKE2B 
226178fbc36eb4755c98951ea1a4494cf5d3a718b7efcf93233ac2c411cff24d54e8ea3ec4e28e6f2d16b5cb1dd1cf7353d220be299726fb1f0687831257c655
 SHA512 
b41f632a12ce43f8bf1e1b9531df54a926ebd374cecc5f986cad6d09b912f62aeeb8853737a93e7c0c597c79c0d5efda753bdf1de88313dc935d63ab43aeb386
 DIST gentoo-kernel-5.4.239-1.x86.gpkg.tar 52439040 BLAKE2B 
998ab0c1e829fe4b3a1b0981837641846525c9107600aa12fd98b6f8f8c5e780c0a814e92783d9ff5d33ca5586833b7d1094b6e044c9a3837f11cbc827129809
 SHA512 
2f41be01f2f2461760c7f4260e9e1540e1db36519786295db80942d7c4ec3d1b01922daf39e5101d5910f72f17d7c6a72526c7df09aa9a2f5e32c0ddb989b0d6
+DIST gentoo-kernel-5.4.240-1.amd64.gpkg.tar 60508160 BLAKE2B 
e0bc29646dd5ab0cce1e25fb80fe6d41a36c683ad5144383bd94a3c9a374e74f934f68861c61089582d18ed85a86fb3478db5dd5eecd89456334b93806dba99b
 SHA512 
39bbe01c48f4dd90e2d2a680081dbdb9f0fa8fc8feacfb7eb754cb4813625a9292eb3b5ed6d58ce047461e43f421234a428f5187d92cb0b714b40f21ce16b783
+DIST gentoo-kernel-5.4.240-1.arm64.gpkg.tar 56514560 BLAKE2B 
e0d6625b428daef61ff95fce0408df0e0888f75f9a73367ef5ee09b9e966fc10e0d917377f2ef776413605f0a19a8c74d6d32970b592a469b4b6a8463d397b85
 SHA512 
9d6d16d3ed91113dc9206127847df5e1cf559da8ac9b93362692f0070763058795e5a946648a25950aeba24e33ac322887bc8e3f0fafa717b606bd332d264c14
+DIST gentoo-kernel-5.4.240-1.ppc64le.gpkg.tar 54210560 BLAKE2B 
1bc8a999ed5681f98420dfa663d5fc18d525b45ea5acf07077c665f6d2457cf0d369ce8f6cf75a067c4185392245759d9203422b73a1ff63cefe78b63c87548f
 SHA512 
06c04e814e82ede60d9f2e92b4af01921a9455610d7f2aa610d19d544d426cc65e40d4e76e4ec35c90a89d00f0540533136e0dfe0a535db4ca806fbada92ed12
+DIST gentoo-kernel-5.4.240-1.x86.gpkg.tar 52439040 BLAKE2B 
0b6879416c518b0556cf4dd62a5a25ea852246ab46981f8fab4ba55a463fca95ece0519e96135dc3c0ff0ed7b5860202928e62b98352f1733ffd1b0fbaf88cc7
 SHA512 
89e7eca11d632d9f360cc6ef255f376cf5d4756d189c5c1a565312e958e01ef645dac301da735b7532a87e1e4df04cc106477953325ebca39ae9db179a0d43f6
 DIST gentoo-kernel-6.1.12-1.amd64.gpkg.tar 76759040 BLAKE2B 
2f2e485ff705b26fa3b1db861acafbdac6362151e30dc73cb2829fbf871cc022641cc15cab82e0d19a25c720f84b6382b74c02d34f658a0cde90a267160f3af2
 SHA512 
d67fd7cf59df2e648bfdc7543995d7f46160d708a2fdd172002fc94d81d4b1bf1b1870754a6d5223a3728484170bbc6f5650c845dad27aab45da8f9f9eeb9232
 DIST gentoo-kernel-6.1.12-1.arm64.gpkg.tar 69447680 BLAKE2B 
83f5eea4ca23eb6e79fad8fd746759982fa1d7e6cbd4cd63d43901aef9be3e7eeb64864f6538bdea6efe2486d13a37042a5533825f924a2af393fe0f66db7a72
 SHA512 
500abfa834826bc3ea7bc97c1b8991e68e72edb8c69ddb316621ff3029bb7962d8c8cb34e73f71ebed2f9db4600b5bf03f925953f67ecc6b46e9db5f35c265fe
 DIST gentoo-kernel-6.1.12-1.ppc64le.gpkg.tar 62781440 BLAKE2B 
5a29a7f274f8b3122209603fc1b05ec7940dfaa0bf9dbcf658897b99203eb091d74f8df8dc9a7fec4b2bb913695c7d78650d062d4b58ade48598f2cbfbd6ff58
 SHA512 
edef917a088aef0b6ec572f678febfcb448c64f70de39697e01be50855e81fc9f3638d432c98ff75bb8963ecc25bf783ad9ce7752cf4705f875415feacda9974

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.240.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.240.ebuild
new file mode 100644
index 000000000000..7e040c8ce69b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.240.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+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}.gpkg.tar
+                       -> ${BINPKG}.amd64.gpkg.tar
+       )
+       arm64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+                       -> ${BINPKG}.arm64.gpkg.tar
+       )
+       ppc64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+                       -> ${BINPKG}.ppc64le.gpkg.tar
+       )
+       x86? (
+               
https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+                       -> ${BINPKG}.x86.gpkg.tar
+       )
+"
+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
+       app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+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 "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+       emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+       kernel-install_test "${KPV}" \
+               
"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" 
\
+               "${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+       mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+       # FIXME: requires proper mount-boot
+       if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+               mv "${BINPKG}"/image/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