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: Fri, 03 Mar 2023 17:33:18
Message-Id: 1677864791.732dc989f9f92f6c48dfbbcb0df6f5907a3ee1e6.mgorny@gentoo
1 commit: 732dc989f9f92f6c48dfbbcb0df6f5907a3ee1e6
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 3 17:25:07 2023 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 3 17:33:11 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=732dc989
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.4.234
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.4.234.ebuild | 127 +++++++++++++++++++++
14 2 files changed, 133 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
17 index 2bd451289ea9..22e246e695fa 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.4-237.base.tar.xz 5514132 BLAKE2B 90509a99ec10e042915362652369
21 DIST genpatches-5.4-237.extras.tar.xz 1812 BLAKE2B 5a4e6b9593a9e9f87afd5f06f03fcdec5fb6072c6689f392821a9778e84634da193c8085ee37348adcd7059ab05ec056e9d7dc9fa27ec98c118ba18878baeeb1 SHA512 21f552b05deabff804c841247fa037e71cca35892f8d212cd5c2c0dcf8a43e455a7d4934f59e4182513dc2257a34f5a976823cf6c0f87a5bf3449365ad353769
22 DIST genpatches-5.4-238.base.tar.xz 5519048 BLAKE2B 9413ae97bb032e51ad570ff2c59ad9527d165563d32a8c9aeb4eea2ff9176115180c0c664f6729ea6aa9b3bfc4968c465636078c2ddf439271f18750ad048ca8 SHA512 d91f42ad1370bcd8bd8f56410abc74b964b123b42a0100c1b4d934d50903d7a4ff4eaa79f02ed85362f0eb3ae6e3e984d1ef85add8f969ca9ddf5c51917cc372
23 DIST genpatches-5.4-238.extras.tar.xz 1812 BLAKE2B b797329d02faf1f7bcc9bebc5f4b028e581a0c45660f15ff6010b6b8d5b920725c4697e26e8ec22fc94070723fba6e5c6fbe273fbd4a5c5245fc0a8247037e5e SHA512 b4adc55c826f9154f977e329dbacb1c5e92a2dee1d694e9b0d2b63d0ce4e3bc55ad05918678865d7964aa6e437f939e7e07652a5498e9a316f09069daae8487f
24 +DIST genpatches-5.4-239.base.tar.xz 5520768 BLAKE2B 9023bb6baa304282c516ae3d8ecff8753bc9b4f0f06166a9e5358d19d6c24d41df4aed6df3174071deabfa9e3224a2c11a94a1b04741c844da88e8f2843178ab SHA512 a776e9663e762d61e5646b56d705a82d17459ff657ef0ffa817b380bb62ed4ba8ca1b84dfba5700c9b33e018736f366b335769005004f9ee15645110a5751d41
25 +DIST genpatches-5.4-239.extras.tar.xz 1812 BLAKE2B f16995331f57d04a5e92164dcb09eab416c56184d9df7546bac597f25614af08053823f3877dcb4ffd54253ad610e9a8c39818290ffde145c3839041ca79fa7e SHA512 c0f6e320892485d8806efc553bef45b9bda7f35bf357af562136d6f10d41c2dcac767595902f2084ddce9ebce9dcc1952e9e72833b79b396dbf398a66017898d
26 DIST genpatches-6.1-14.base.tar.xz 774040 BLAKE2B 8e0866c762e2711b766cc75630d66c7c46221bdc47357a903c7e8506ad122b7b5ba84d102b19743d236ac5579b44d24f77b9f52f3c23695ab6a279cf7875e735 SHA512 6a753146013baf0b94d83abd690118517679d4d7dcf6e9f86cf8de35e24f80a792e9c0692f237098671c316d046d6f65f8d3512255e572daf6a8ca81853beca0
27 DIST genpatches-6.1-14.extras.tar.xz 3804 BLAKE2B 7f016579b130c9a4f7a8ec946254dbd682f22e5654ae777d11b265dafe2b177a4c40c5a979a760a5bd6ed3dac057b90a3120c60b958f6b748ea4731b9a5f1ea6 SHA512 2807d359459dd11b9d3356fcac609dbfb8487e8c924cc543ef37698667b1c8b74cff7b015839ca0677cf1f96b566e0b5018c057b517275886ab500cd2ca49653
28 DIST genpatches-6.1-15.base.tar.xz 803732 BLAKE2B 5f43fb07787e9e861b54b4977acff47c13870b24cba98296538651c656e332be2bd194b91a67d68858bb7ddf116e0e97179c5c039c64b75f4392829d091ee387 SHA512 482cb110c5d218a0b0dd4dd828862d9cfb5044b5c90f75218dd7bbf266dba1a11af11ecd913029904d6de1d572d2cbb247b5bbf1c4bb5711eb9fb03b327aaa81
29 @@ -70,6 +72,10 @@ DIST gentoo-kernel-5.4.233-1.amd64.gpkg.tar 60497920 BLAKE2B 15b5834879c81ab8997
30 DIST gentoo-kernel-5.4.233-1.arm64.gpkg.tar 56504320 BLAKE2B 85891518deb6299006e837718e684793b95fd4fa8419ac954966552081eccb8f9130323c83bb8567a2ffe033281c2fde56b45ed5a13dcdb6d333d97e83fd109c SHA512 68d4afb1bb57c7d34a01d03d9f8378d4fa91a3bd3eedf5b1339603956571df347bc1f3ca57fcb0c4a403599f2f9e2140cc801193c319accec0e1bf3b9cf3421b
31 DIST gentoo-kernel-5.4.233-1.ppc64le.gpkg.tar 54210560 BLAKE2B 255437e634bbc730f48fb31fa390f4a0aade3219d84359aea9f3a4e87bbb5dc66b30e370a00389e140e0ea909be01758ea1e3ec1c7f143df874f20928bf7962a SHA512 7c67065fc2bb72705c8ff1e21a547cc6228cf34a943984e86e19de63e3178c7d020ece7b50ff1b0ce924110af1e034f9e4cb537d88859f6bf1202e403f39cdcf
32 DIST gentoo-kernel-5.4.233-1.x86.gpkg.tar 52418560 BLAKE2B b88c9973525512113bab88e17893c2947de082502dc06a2857ff2029530373ad1f4b3f9af7072dc8211f582259ef0591db7383b48950390425eb8fd6242362d2 SHA512 d2672ea2b0d7eca8b28ac3d7cb53c9d79ce1bcae41a84517f048f1541a8d9873f0eee01ccc040a1be2c5c431823f5a1def0ce10345adc315349f6b800f17c2a0
33 +DIST gentoo-kernel-5.4.234-1.amd64.gpkg.tar 60518400 BLAKE2B fa075656f48f867ccd853143f4379994b2b50e026d85bc074966bb2fbeeb6ccec245b046afee1e47819e0f706e76fc6d528b24e3ec142f63117c53d96b624ca1 SHA512 4be32c4621aaae8b184d123f90b9ad87aef49eb3048ec504aabaf634849652c45e509fa786c0834c295d367190151982cce7720a30b246fd3348e2b394be68cd
34 +DIST gentoo-kernel-5.4.234-1.arm64.gpkg.tar 56514560 BLAKE2B eeaa2bb44d67ff06fe6af3d5423ed6d287451e4731efa0d02b6c6d6996fa0403204262eb8f873b935eee8d662b7afa2bfe3fc3388fd8d718a7fe304b6d919cd1 SHA512 b4b523b891997a9c874219cfe8d53b31bf2b44fbe6538bbf248b6b88a4f455cf0ccdbe99ac44fcb28fc6c8dee2f3eadbf00ee8c91e744fe6b9c9c3fe51f60f77
35 +DIST gentoo-kernel-5.4.234-1.ppc64le.gpkg.tar 54210560 BLAKE2B 033e48851a7c0766d395521c98e1269f449b0c15c89f202da6af34d187e9f7b066daf421c473ee24b6a7ccec93c38e7dd33be1c70f4c8b181c5fa1f196aac51e SHA512 bc0448b6a7de2586aedd07b6a0bd17f2596d779854f32401b7529f3465e8199928b4297c8910e6f40ae57b81839849e5d1fb524c5e4e50d3f51073bc8d9a1268
36 +DIST gentoo-kernel-5.4.234-1.x86.gpkg.tar 52408320 BLAKE2B 73167475b5b8e88a4f72298c4d763b70e4f7274c6aafd639e454663a663525d03840e6c6691f64b74e1a79a80df8b82332ce5ae7c18e7dbd57379e1d801987af SHA512 05d2010fc3172aaddc26d3c9865bda2b74e91b5a5f0094d8d0ced08ec5df108bb86e56cc9796b117b5fbb486c74342e85188ed706409bfa4ac61fd67844f187e
37 DIST gentoo-kernel-6.1.12-1.amd64.gpkg.tar 76759040 BLAKE2B 2f2e485ff705b26fa3b1db861acafbdac6362151e30dc73cb2829fbf871cc022641cc15cab82e0d19a25c720f84b6382b74c02d34f658a0cde90a267160f3af2 SHA512 d67fd7cf59df2e648bfdc7543995d7f46160d708a2fdd172002fc94d81d4b1bf1b1870754a6d5223a3728484170bbc6f5650c845dad27aab45da8f9f9eeb9232
38 DIST gentoo-kernel-6.1.12-1.arm64.gpkg.tar 69447680 BLAKE2B 83f5eea4ca23eb6e79fad8fd746759982fa1d7e6cbd4cd63d43901aef9be3e7eeb64864f6538bdea6efe2486d13a37042a5533825f924a2af393fe0f66db7a72 SHA512 500abfa834826bc3ea7bc97c1b8991e68e72edb8c69ddb316621ff3029bb7962d8c8cb34e73f71ebed2f9db4600b5bf03f925953f67ecc6b46e9db5f35c265fe
39 DIST gentoo-kernel-6.1.12-1.ppc64le.gpkg.tar 62781440 BLAKE2B 5a29a7f274f8b3122209603fc1b05ec7940dfaa0bf9dbcf658897b99203eb091d74f8df8dc9a7fec4b2bb913695c7d78650d062d4b58ade48598f2cbfbd6ff58 SHA512 edef917a088aef0b6ec572f678febfcb448c64f70de39697e01be50855e81fc9f3638d432c98ff75bb8963ecc25bf783ad9ce7752cf4705f875415feacda9974
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.234.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.234.ebuild
42 new file mode 100644
43 index 000000000000..64a82c2b8323
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.234.ebuild
46 @@ -0,0 +1,127 @@
47 +# Copyright 2020-2023 Gentoo Authors
48 +# Distributed under the terms of the GNU General Public License v2
49 +
50 +EAPI=8
51 +
52 +inherit kernel-install toolchain-funcs unpacker
53 +
54 +MY_P=linux-${PV%.*}
55 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
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}.gpkg.tar
66 + -> ${BINPKG}.amd64.gpkg.tar
67 + )
68 + arm64? (
69 + https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
70 + -> ${BINPKG}.arm64.gpkg.tar
71 + )
72 + ppc64? (
73 + https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
74 + -> ${BINPKG}.ppc64le.gpkg.tar
75 + )
76 + x86? (
77 + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
78 + -> ${BINPKG}.x86.gpkg.tar
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 + app-alternatives/yacc
97 +"
98 +
99 +QA_PREBUILT='*'
100 +
101 +KV_LOCALVERSION='-gentoo-dist'
102 +KPV=${PV}${KV_LOCALVERSION}
103 +
104 +src_prepare() {
105 + local PATCHES=(
106 + # meh, genpatches have no directory
107 + "${WORKDIR}"/*.patch
108 + )
109 + cd "${MY_P}" || die
110 + default
111 +}
112 +
113 +src_configure() {
114 + # force ld.bfd if we can find it easily
115 + local LD="$(tc-getLD)"
116 + if type -P "${LD}.bfd" &>/dev/null; then
117 + LD+=.bfd
118 + fi
119 +
120 + tc-export_build_env
121 + local makeargs=(
122 + V=1
123 +
124 + HOSTCC="$(tc-getBUILD_CC)"
125 + HOSTCXX="$(tc-getBUILD_CXX)"
126 + HOSTCFLAGS="${BUILD_CFLAGS}"
127 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
128 +
129 + CROSS_COMPILE=${CHOST}-
130 + AS="$(tc-getAS)"
131 + CC="$(tc-getCC)"
132 + LD="${LD}"
133 + AR="$(tc-getAR)"
134 + NM="$(tc-getNM)"
135 + STRIP=":"
136 + OBJCOPY="$(tc-getOBJCOPY)"
137 + OBJDUMP="$(tc-getOBJDUMP)"
138 +
139 + # we need to pass it to override colliding Gentoo envvar
140 + ARCH="$(tc-arch-kernel)"
141 +
142 + O="${WORKDIR}"/modprep
143 + )
144 +
145 + mkdir modprep || die
146 + cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
147 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
148 +}
149 +
150 +src_test() {
151 + kernel-install_test "${KPV}" \
152 + "${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
153 + "${BINPKG}/image/lib/modules/${KPV}"
154 +}
155 +
156 +src_install() {
157 + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
158 +
159 + # FIXME: requires proper mount-boot
160 + if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
161 + mv "${BINPKG}"/image/boot "${ED}"/ || die
162 + fi
163 +
164 + # strip out-of-source build stuffs from modprep
165 + # and then copy built files
166 + find modprep -type f '(' \
167 + -name Makefile -o \
168 + -name '*.[ao]' -o \
169 + '(' -name '.*' -a -not -name '.config' ')' \
170 + ')' -delete || die
171 + rm modprep/source || die
172 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
173 +}