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: Wed, 29 Jun 2022 17:36:39
Message-Id: 1656524187.8e7798b941034233415d5417bea7c1f66bb26247.mgorny@gentoo
1 commit: 8e7798b941034233415d5417bea7c1f66bb26247
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 29 17:27:21 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 29 17:36:27 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7798b9
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.51
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.51.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 b3ad78861135..5b05688d4b3a 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -12,6 +12,8 @@ DIST genpatches-5.15-53.base.tar.xz 2200544 BLAKE2B a6f1e11186e771abe56bb453d45f
21 DIST genpatches-5.15-53.extras.tar.xz 3932 BLAKE2B ade13a83b27b14cf19f455539599aff1db3bc6caf99d07e746b292be702c49591519b63f754c4651ac3e0e867412cb5ffb588d5056cf6066c193e09a0c3feaf2 SHA512 438905963b586148d6385f24549343a6fc4d623f24aea089f52af44f772eaa62f0602d729b0232620d8ca08d440210dc7dbe7b5259a3fc232d603f574b5bf714
22 DIST genpatches-5.15-54.base.tar.xz 2203912 BLAKE2B 36e27d2734e9a62b1900907ea3722a522ddc61c991b5c751dd09d055b9da0fa92bd0de3eeee8b1560ff9a60c8d80181904dd14b7db7878b499a07bb31b0b5f90 SHA512 e751fbd89b91dc59dd0ac87f906ad1c4ae69ccfcad97db616bddd0d25184c133cba8af1141f5e32f690199d6196d0a5035941b70576cd4dd80aea750d1ce0c27
23 DIST genpatches-5.15-54.extras.tar.xz 3936 BLAKE2B 259497959ac6cd96036809fbc1634fa174e611f626b0f36c8003587ec0825fd75431b34329ecf4a9d9aeda3803986b2e3987f27d37e0fddf27eb83509c248548 SHA512 7c85e42f6195f6a0bdafbf0be5fbbab1b7a634a922c5233d1dfc2c29842fe4617888cdd7769584d2e918457bdd1a295b8761e354772d78b05cd1e917e9f71abb
24 +DIST genpatches-5.15-55.base.tar.xz 2235252 BLAKE2B 7304a492e04d83ec505c76af4f3eb61999547647bcbcfcc82a2211aadbbd2fd63bc3335eeee9ccb8927d3d0486e41afeab6adbe3d3e8da4ad0c13d39f1ff4139 SHA512 47c488dcba5854a28a6b8f968e13f97fb31dc5f31a5a3abde426df7972a890c8fa36530ead386f02f3ecfaf2ac49da1e27d8a2de2df5c6a5c5fdf302e3c492fa
25 +DIST genpatches-5.15-55.extras.tar.xz 3932 BLAKE2B 50132ad9a1b3a9012ff46cc2ed8c0d18ffd7c48aed1c481eff24e4757652e3787172049a3025b2586092382c827c6d139930d157d039258d07ad228ea716c12d SHA512 188abe81e73bf1a809125dc634e10be8427c1d11f696f4ad7fa60a0ba269773278e3a9e568e3640f7ad8fb8f4736de7292a154b05f8f7bfab4fe1fbe341bceb8
26 DIST genpatches-5.18-10.base.tar.xz 500696 BLAKE2B e6dfe7b2f752aa0cadb2de11ed7e9e77935abf4d61c99fdb4f6790853364c8b8b189d25b2190b3c85b51ef355b085d1ab740599a920843534f0d4a840fbe8733 SHA512 d425826ca98a5600262485aae057401c131e63b2b84ef6eaea287a433acd4b0f98e3899bd931ac73eda5651c57bcc4bec730469655d54aa1f176ebfda6724aa6
27 DIST genpatches-5.18-10.extras.tar.xz 3924 BLAKE2B ea024b19777b6fd59ad5505eaff41db7dc793f5f29beca1d70c2ab60829f5864f1b78f9b809fa9443f995f70df82746d33ac9ce9453a564b77c3964b49afe822 SHA512 7468faea1020335f546c69d331aa864400687056a01cb54a888f3d4bbe6c9061fc2a5d519f93aa362b87df953bb13c06ea2dda403e48f63ca259a6990120ff5f
28 DIST genpatches-5.18-8.base.tar.xz 440848 BLAKE2B 8a965867409cc340b13687eec9c7391bbaf26b770ba8d4b657b923226a539b7b68eabab6f12bae4bed09a0d198917373a6ab4f707831c652e2461a49f8dd4981 SHA512 057a00d62f4d8ba7be4ea26aeaa4bfbd5581b22ded85dae71aaa693621eda17532ac00bbeaaea1689f552ce2b95a04e9aade603f6236c2a265aa8fea8231c5d0
29 @@ -54,6 +56,10 @@ DIST gentoo-kernel-5.15.50-1.amd64.xpak 69277543 BLAKE2B f3ea00ad0b9708c68a07cd7
30 DIST gentoo-kernel-5.15.50-1.arm64.xpak 64189904 BLAKE2B 8fab84733c326dde8dace4fe0b6af4799cf06607447837a510b7d82904422e069da8d0c6690c2a8ed3d72453f02c478b83e993e3405f2e223752b6b631cb963f SHA512 e9009648544997b620ad833d6fa52f1fbae1d37674b449ed60d74ae066026cbaed573fc8eac9dfca6e384915d6595de2e7b2d8a2fbed7edd1f3693c1ae652bf6
31 DIST gentoo-kernel-5.15.50-1.ppc64le.xpak 58219901 BLAKE2B 115a8ba67c3b55dcc572107e925565305283a2817b6c51083d478a253425e35a5eed55f72fa92c798f0cc95b14d7a5405412436b76b4042f6fc0f8dead956a54 SHA512 73d5583adeaae8851d59be1c69242b87480674ee9c3fed4fbbe1bc9e269ede6683b3817a56b424016717ffc7356d7e751204cbc7b5d83022c9fa975ebfc47c5d
32 DIST gentoo-kernel-5.15.50-1.x86.xpak 60114559 BLAKE2B 7a10a4e4b4bc2c006aae202db249fd6d593e22ac04210aef8c7b5582081d4c18ef128de1640d7586e6efaf47847e036bf1b9508bf5171b3842ec323b26e4c7b6 SHA512 bae8a1fb2b5312f7c59d25162102fda069d2d1908ebb0baa9c9be3c4c52cd49b1d37abfd6c8a719c1a84bf4d332b6245c1a54e6635b7a30fc590bb7791175065
33 +DIST gentoo-kernel-5.15.51-1.amd64.xpak 69309556 BLAKE2B 67da4e954e56e2a29572b88c4f63d850eec0084c87be750a027ea8e890d3bedce3da8b4f537c62a62636403251fbf3c9b68113a00c3b77b9f4904af3badc58a3 SHA512 9d0e7743678e5d00ef31cff9bcd778c39607b9d6c6cd71e068d35cd9a7803f294d85388c3c58a2c2181e5cfb6be777aa528b3140942274a2e15b03e705d5316e
34 +DIST gentoo-kernel-5.15.51-1.arm64.xpak 64196759 BLAKE2B 0a4cda382732b176a5154b20170b563c0833f1a7eb3597ca9b25ab7ae1e4633485403b01edd48918a72147ecf75d8dc2b9d64bfb1ab5c97539232ff2bedcb77b SHA512 08a9ea4f89b17a391047e82f35f7ebe0e4300721d3cacaf850eaee841bf6e3a599ba1a0fc6858ab5c3225ab2d8fe19bc556d026030dda557c386e78156a5647b
35 +DIST gentoo-kernel-5.15.51-1.ppc64le.xpak 58159508 BLAKE2B cff69bf1ebf4ca29dc63a449a1fed9401b0fd564ccaa571dd05e4e2e2ff661d8bf5599984045e29c026d3b6eb3b6b568b3c6cf9297355ecfea42e3f5e10092cd SHA512 2d619d149ae96cde6e91f89be128535aa798e1f3a344a7d5d080a4c5b6affb3d13b9ee279af445825267e13f6d595d4c3093c8b5ae799398d8a538c3f4590220
36 +DIST gentoo-kernel-5.15.51-1.x86.xpak 60074334 BLAKE2B 3a4244484c3a8eb35e084e22c2e8d2dde81fea2333069795b66bb2eac7f6f5012871a0ce6cc53dad19888e065a46ab3f082c69abde44136dc5bfceccebe53af9 SHA512 151c5570d473aa88c8ed6e6052d68b19b6150df1c0e7abd08b6dc7213103693f28d9f856e05f60e79142c46fc89c50b2a511750561df0a63a9dd420383b0accc
37 DIST gentoo-kernel-5.18.5-1.amd64.xpak 71624251 BLAKE2B 906903314080f075709b091cac9471975a7af4833e76a6ff6143aad4a1d4e3bb258a350e15573163eae0a018df917c965cca1d35404c2cddb7777a2a300fd345 SHA512 eca0e7978e9e214d3d18a9cd78ff62e9ec2b1c320f030ce45996743cb809a1072cffe7680065c7f8272eead9c9ff25a04e956a9af53f9ab2013a4a12a5660b5d
38 DIST gentoo-kernel-5.18.5-1.arm64.xpak 65223184 BLAKE2B 9b54ac0556c6515a9303f6c636cc32c78c8c2b5a0afa03ee7f1ab627a6cc51847d2e606d4beedeb0373ce00d87f7b41b49c8f6173d9154721113051e6b335f6a SHA512 109860d371ddfc7f17c3ff0d41e683f9adf8213aa880f8171e212b7d5a4109098f6ea2cb51355de0622ace8c3c69f094ff12331f230b618d912e85e4b1944f4b
39 DIST gentoo-kernel-5.18.5-1.ppc64le.xpak 59550570 BLAKE2B d22a29421f489f9e27018b166801fb039b7a7c58e45efad3eb2841a2e9bc2e554da116c469db7ac0845debd86969ce975ed5c5a4392e33aa8b3a626882a52fc4 SHA512 005450035299a52699bee929bc7135a25536f633ebf23cee71ef771760c93104fe8ea63016e367fa7ffdf7d1b42b8f173b8a87c6a2aed7b868ff4bf35bfdf767
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.51.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.51.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.51.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 +}