[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/ - 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, 28 Sep 2022 04:22:20
Message-Id:	`1664338931.21a26062d6c11e4a96ab95b2bc3c3217daf5b22e.mgorny@gentoo`

1

commit:     21a26062d6c11e4a96ab95b2bc3c3217daf5b22e

2

Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>

3

AuthorDate: Sat Sep 24 14:56:46 2022 +0000

4

Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>

5

CommitDate: Wed Sep 28 04:22:11 2022 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a26062

7

8

sys-kernel/gentoo-kernel-bin: Use unpacker.eclass for .gpkg.tar

9

10

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

11

12

 .../gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild | 17 ++++++-----------

13

 .../gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild  | 17 ++++++-----------

14

 .../gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild  | 17 ++++++-----------

15

 .../gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild  | 17 ++++++-----------

16

 4 files changed, 24 insertions(+), 44 deletions(-)

17

18

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild

19

index 691ad14894b2..26eed75d6c06 100644

20

--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild

21

+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild

22

@@ -3,7 +3,7 @@

23

24

 EAPI=8

25

26

-inherit kernel-install toolchain-funcs

27

+inherit kernel-install toolchain-funcs unpacker

28

29

 MY_P=linux-${PV%.*}

30

 GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))

31

@@ -55,11 +55,6 @@ QA_PREBUILT='*'

32

 KV_LOCALVERSION='-gentoo-dist'

33

 KPV=${PV}${KV_LOCALVERSION}

34

35

-src_unpack() {

36

-	default

37

-	unpack "${BINPKG}"/image.tar.xz

38

-}

39

-

40

 src_prepare() {

41

 	local PATCHES=(

42

 		# meh, genpatches have no directory

43

@@ -102,22 +97,22 @@ src_configure() {

44

)

45

46

 	mkdir modprep || die

47

-	cp "image/usr/src/linux-${KPV}/.config" modprep/ || die

48

+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die

49

 	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare

50

}

51

52

 src_test() {

53

 	kernel-install_test "${KPV}" \

54

-		"${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \

55

-		"image/lib/modules/${KPV}"

56

+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \

57

+		"${BINPKG}/image/lib/modules/${KPV}"

58

}

59

60

 src_install() {

61

-	mv image/{lib,usr} "${ED}"/ || die

62

+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die

63

64

 	# FIXME: requires proper mount-boot

65

 	if [[ -d boot/dtbs ]]; then

66

-		mv image/boot "${ED}"/ || die

67

+		mv "${BINPKG}"/image/boot "${ED}"/ || die

68

fi

69

70

 	# strip out-of-source build stuffs from modprep

71

72

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild

73

index e1d7752b26f1..9c843f83530a 100644

74

--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild

75

+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild

76

@@ -3,7 +3,7 @@

77

78

 EAPI=8

79

80

-inherit kernel-install toolchain-funcs

81

+inherit kernel-install toolchain-funcs unpacker

82

83

 MY_P=linux-${PV%.*}

84

 GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))

85

@@ -55,11 +55,6 @@ QA_PREBUILT='*'

86

 KV_LOCALVERSION='-gentoo-dist'

87

 KPV=${PV}${KV_LOCALVERSION}

88

89

-src_unpack() {

90

-	default

91

-	unpack "${BINPKG}"/image.tar.xz

92

-}

93

-

94

 src_prepare() {

95

 	local PATCHES=(

96

 		# meh, genpatches have no directory

97

@@ -102,22 +97,22 @@ src_configure() {

98

)

99

100

 	mkdir modprep || die

101

-	cp "image/usr/src/linux-${KPV}/.config" modprep/ || die

102

+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die

103

 	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare

104

}

105

106

 src_test() {

107

 	kernel-install_test "${KPV}" \

108

-		"${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \

109

-		"image/lib/modules/${KPV}"

110

+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \

111

+		"${BINPKG}/image/lib/modules/${KPV}"

112

}

113

114

 src_install() {

115

-	mv image/{lib,usr} "${ED}"/ || die

116

+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die

117

118

 	# FIXME: requires proper mount-boot

119

 	if [[ -d boot/dtbs ]]; then

120

-		mv image/boot "${ED}"/ || die

121

+		mv "${BINPKG}"/image/boot "${ED}"/ || die

122

fi

123

124

 	# strip out-of-source build stuffs from modprep

125

126

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild

127

index 966fadbe839a..0ba336c5c1aa 100644

128

--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild

129

+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild

130

@@ -3,7 +3,7 @@

131

132

 EAPI=8

133

134

-inherit kernel-install toolchain-funcs

135

+inherit kernel-install toolchain-funcs unpacker

136

137

 MY_P=linux-${PV%.*}

138

 GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))

139

@@ -55,11 +55,6 @@ QA_PREBUILT='*'

140

 KV_LOCALVERSION='-gentoo-dist'

141

 KPV=${PV}${KV_LOCALVERSION}

142

143

-src_unpack() {

144

-	default

145

-	unpack "${BINPKG}"/image.tar.xz

146

-}

147

-

148

 src_prepare() {

149

 	local PATCHES=(

150

 		# meh, genpatches have no directory

151

@@ -102,22 +97,22 @@ src_configure() {

152

)

153

154

 	mkdir modprep || die

155

-	cp "image/usr/src/linux-${KPV}/.config" modprep/ || die

156

+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die

157

 	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare

158

}

159

160

 src_test() {

161

 	kernel-install_test "${KPV}" \

162

-		"${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \

163

-		"image/lib/modules/${KPV}"

164

+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \

165

+		"${BINPKG}/image/lib/modules/${KPV}"

166

}

167

168

 src_install() {

169

-	mv image/{lib,usr} "${ED}"/ || die

170

+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die

171

172

 	# FIXME: requires proper mount-boot

173

 	if [[ -d boot/dtbs ]]; then

174

-		mv image/boot "${ED}"/ || die

175

+		mv "${BINPKG}"/image/boot "${ED}"/ || die

176

fi

177

178

 	# strip out-of-source build stuffs from modprep

179

180

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild

181

index 13605295f2bb..7d29184e6c6b 100644

182

--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild

183

+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild

184

@@ -3,7 +3,7 @@

185

186

 EAPI=8

187

188

-inherit kernel-install toolchain-funcs

189

+inherit kernel-install toolchain-funcs unpacker

190

191

 MY_P=linux-${PV%.*}

192

 GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))

193

@@ -55,11 +55,6 @@ QA_PREBUILT='*'

194

 KV_LOCALVERSION='-gentoo-dist'

195

 KPV=${PV}${KV_LOCALVERSION}

196

197

-src_unpack() {

198

-	default

199

-	unpack "${BINPKG}"/image.tar.xz

200

-}

201

-

202

 src_prepare() {

203

 	local PATCHES=(

204

 		# meh, genpatches have no directory

205

@@ -102,22 +97,22 @@ src_configure() {

206

)

207

208

 	mkdir modprep || die

209

-	cp "image/usr/src/linux-${KPV}/.config" modprep/ || die

210

+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die

211

 	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare

212

}

213

214

 src_test() {

215

 	kernel-install_test "${KPV}" \

216

-		"${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \

217

-		"image/lib/modules/${KPV}"

218

+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \

219

+		"${BINPKG}/image/lib/modules/${KPV}"

220

}

221

222

 src_install() {

223

-	mv image/{lib,usr} "${ED}"/ || die

224

+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die

225

226

 	# FIXME: requires proper mount-boot

227

 	if [[ -d boot/dtbs ]]; then

228

-		mv image/boot "${ED}"/ || die

229

+		mv "${BINPKG}"/image/boot "${ED}"/ || die

230

fi

231

232

 	# strip out-of-source build stuffs from modprep

1	commit: 21a26062d6c11e4a96ab95b2bc3c3217daf5b22e
2	Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3	AuthorDate: Sat Sep 24 14:56:46 2022 +0000
4	Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5	CommitDate: Wed Sep 28 04:22:11 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a26062
7
8	sys-kernel/gentoo-kernel-bin: Use unpacker.eclass for .gpkg.tar
9
10	Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12	.../gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild \| 17 ++++++-----------
13	.../gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild \| 17 ++++++-----------
14	.../gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild \| 17 ++++++-----------
15	.../gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild \| 17 ++++++-----------
16	4 files changed, 24 insertions(+), 44 deletions(-)
17
18	diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild
19	index 691ad14894b2..26eed75d6c06 100644
20	--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild
21	+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.145.ebuild
22	@@ -3,7 +3,7 @@
23
24	EAPI=8
25
26	-inherit kernel-install toolchain-funcs
27	+inherit kernel-install toolchain-funcs unpacker
28
29	MY_P=linux-${PV%.*}
30	GENPATCHES_P=genpatches-${PV%.}-$(( ${PV##.} + 9 ))
31	@@ -55,11 +55,6 @@ QA_PREBUILT='*'
32	KV_LOCALVERSION='-gentoo-dist'
33	KPV=${PV}${KV_LOCALVERSION}
34
35	-src_unpack() {
36	- default
37	- unpack "${BINPKG}"/image.tar.xz
38	-}
39	-
40	src_prepare() {
41	local PATCHES=(
42	# meh, genpatches have no directory
43	@@ -102,22 +97,22 @@ src_configure() {
44	)
45
46	mkdir modprep \|\| die
47	- cp "image/usr/src/linux-${KPV}/.config" modprep/ \|\| die
48	+ cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ \|\| die
49	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
50	}
51
52	src_test() {
53	kernel-install_test "${KPV}" \
54	- "${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
55	- "image/lib/modules/${KPV}"
56	+ "${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
57	+ "${BINPKG}/image/lib/modules/${KPV}"
58	}
59
60	src_install() {
61	- mv image/{lib,usr} "${ED}"/ \|\| die
62	+ mv "${BINPKG}"/image/{lib,usr} "${ED}"/ \|\| die
63
64	# FIXME: requires proper mount-boot
65	if [[ -d boot/dtbs ]]; then
66	- mv image/boot "${ED}"/ \|\| die
67	+ mv "${BINPKG}"/image/boot "${ED}"/ \|\| die
68	fi
69
70	# strip out-of-source build stuffs from modprep
71
72	diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild
73	index e1d7752b26f1..9c843f83530a 100644
74	--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild
75	+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.70.ebuild
76	@@ -3,7 +3,7 @@
77
78	EAPI=8
79
80	-inherit kernel-install toolchain-funcs
81	+inherit kernel-install toolchain-funcs unpacker
82
83	MY_P=linux-${PV%.*}
84	GENPATCHES_P=genpatches-${PV%.}-$(( ${PV##.} + 4 ))
85	@@ -55,11 +55,6 @@ QA_PREBUILT='*'
86	KV_LOCALVERSION='-gentoo-dist'
87	KPV=${PV}${KV_LOCALVERSION}
88
89	-src_unpack() {
90	- default
91	- unpack "${BINPKG}"/image.tar.xz
92	-}
93	-
94	src_prepare() {
95	local PATCHES=(
96	# meh, genpatches have no directory
97	@@ -102,22 +97,22 @@ src_configure() {
98	)
99
100	mkdir modprep \|\| die
101	- cp "image/usr/src/linux-${KPV}/.config" modprep/ \|\| die
102	+ cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ \|\| die
103	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
104	}
105
106	src_test() {
107	kernel-install_test "${KPV}" \
108	- "${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
109	- "image/lib/modules/${KPV}"
110	+ "${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
111	+ "${BINPKG}/image/lib/modules/${KPV}"
112	}
113
114	src_install() {
115	- mv image/{lib,usr} "${ED}"/ \|\| die
116	+ mv "${BINPKG}"/image/{lib,usr} "${ED}"/ \|\| die
117
118	# FIXME: requires proper mount-boot
119	if [[ -d boot/dtbs ]]; then
120	- mv image/boot "${ED}"/ \|\| die
121	+ mv "${BINPKG}"/image/boot "${ED}"/ \|\| die
122	fi
123
124	# strip out-of-source build stuffs from modprep
125
126	diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild
127	index 966fadbe839a..0ba336c5c1aa 100644
128	--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild
129	+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.11.ebuild
130	@@ -3,7 +3,7 @@
131
132	EAPI=8
133
134	-inherit kernel-install toolchain-funcs
135	+inherit kernel-install toolchain-funcs unpacker
136
137	MY_P=linux-${PV%.*}
138	GENPATCHES_P=genpatches-${PV%.}-$(( ${PV##.} + 2 ))
139	@@ -55,11 +55,6 @@ QA_PREBUILT='*'
140	KV_LOCALVERSION='-gentoo-dist'
141	KPV=${PV}${KV_LOCALVERSION}
142
143	-src_unpack() {
144	- default
145	- unpack "${BINPKG}"/image.tar.xz
146	-}
147	-
148	src_prepare() {
149	local PATCHES=(
150	# meh, genpatches have no directory
151	@@ -102,22 +97,22 @@ src_configure() {
152	)
153
154	mkdir modprep \|\| die
155	- cp "image/usr/src/linux-${KPV}/.config" modprep/ \|\| die
156	+ cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ \|\| die
157	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
158	}
159
160	src_test() {
161	kernel-install_test "${KPV}" \
162	- "${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
163	- "image/lib/modules/${KPV}"
164	+ "${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
165	+ "${BINPKG}/image/lib/modules/${KPV}"
166	}
167
168	src_install() {
169	- mv image/{lib,usr} "${ED}"/ \|\| die
170	+ mv "${BINPKG}"/image/{lib,usr} "${ED}"/ \|\| die
171
172	# FIXME: requires proper mount-boot
173	if [[ -d boot/dtbs ]]; then
174	- mv image/boot "${ED}"/ \|\| die
175	+ mv "${BINPKG}"/image/boot "${ED}"/ \|\| die
176	fi
177
178	# strip out-of-source build stuffs from modprep
179
180	diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild
181	index 13605295f2bb..7d29184e6c6b 100644
182	--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild
183	+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild
184	@@ -3,7 +3,7 @@
185
186	EAPI=8
187
188	-inherit kernel-install toolchain-funcs
189	+inherit kernel-install toolchain-funcs unpacker
190
191	MY_P=linux-${PV%.*}
192	GENPATCHES_P=genpatches-${PV%.}-$(( ${PV##.} + 5 ))
193	@@ -55,11 +55,6 @@ QA_PREBUILT='*'
194	KV_LOCALVERSION='-gentoo-dist'
195	KPV=${PV}${KV_LOCALVERSION}
196
197	-src_unpack() {
198	- default
199	- unpack "${BINPKG}"/image.tar.xz
200	-}
201	-
202	src_prepare() {
203	local PATCHES=(
204	# meh, genpatches have no directory
205	@@ -102,22 +97,22 @@ src_configure() {
206	)
207
208	mkdir modprep \|\| die
209	- cp "image/usr/src/linux-${KPV}/.config" modprep/ \|\| die
210	+ cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ \|\| die
211	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
212	}
213
214	src_test() {
215	kernel-install_test "${KPV}" \
216	- "${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
217	- "image/lib/modules/${KPV}"
218	+ "${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
219	+ "${BINPKG}/image/lib/modules/${KPV}"
220	}
221
222	src_install() {
223	- mv image/{lib,usr} "${ED}"/ \|\| die
224	+ mv "${BINPKG}"/image/{lib,usr} "${ED}"/ \|\| die
225
226	# FIXME: requires proper mount-boot
227	if [[ -d boot/dtbs ]]; then
228	- mv image/boot "${ED}"/ \|\| die
229	+ mv "${BINPKG}"/image/boot "${ED}"/ \|\| die
230	fi
231
232	# strip out-of-source build stuffs from modprep

Gentoo Archives: gentoo-commits