1 |
commit: ccfd9372f010775751a71e8c5575e452d074298a |
2 |
Author: Guy Martin <gmsoft <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 23 16:31:24 2014 +0000 |
4 |
Commit: Guy Martin <gmsoft <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 23 16:31:24 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=ccfd9372 |
7 |
|
8 |
Don't use version specific libs and add missing DNS libs. |
9 |
|
10 |
--- |
11 |
releases/weekly/specs/hppa/netboot2-hppa32.spec | 93 ++++++++----------------- |
12 |
releases/weekly/specs/hppa/netboot2-hppa64.spec | 93 ++++++++----------------- |
13 |
2 files changed, 58 insertions(+), 128 deletions(-) |
14 |
|
15 |
diff --git a/releases/weekly/specs/hppa/netboot2-hppa32.spec b/releases/weekly/specs/hppa/netboot2-hppa32.spec |
16 |
index 285eeb7..431b515 100644 |
17 |
--- a/releases/weekly/specs/hppa/netboot2-hppa32.spec |
18 |
+++ b/releases/weekly/specs/hppa/netboot2-hppa32.spec |
19 |
@@ -1,6 +1,6 @@ |
20 |
# HPPA Netboot spec file by Guy Martin |
21 |
-version_stamp: 20130927 |
22 |
-snapshot: 20130927 |
23 |
+version_stamp: 20130927 |
24 |
+snapshot: 20130927 |
25 |
source_subpath: default/stage3-hppa1.1-20130927 |
26 |
|
27 |
# these shouldn't change |
28 |
@@ -12,11 +12,9 @@ profile: default/linux/hppa/13.0 |
29 |
# netboot2 stuff |
30 |
boot/kernel: netboot32 |
31 |
boot/kernel/netboot32/sources: sys-kernel/gentoo-sources |
32 |
-boot/kernel/netboot32/config: /root/gmsoft-specs/netboot-3.10.7-gentoo-netboot32.config |
33 |
+boot/kernel/netboot32/config: /root/releng/releases/weekly/kconfig/hppa/netboot-3.10.7-gentoo-netboot32.config |
34 |
boot/kernel/netboot32/gk_kernargs: --arch-override=parisc --all-ramdisk-modules |
35 |
|
36 |
-#netboot2/busybox_config: /root/myspecs/busybox-config |
37 |
- |
38 |
netboot2/use: |
39 |
-* |
40 |
multicall |
41 |
@@ -79,28 +77,20 @@ netboot2/packages/sys-fs/e2fsprogs/files: |
42 |
/sbin/fsck.ext4 |
43 |
/sbin/fsck.ext3 |
44 |
/sbin/fsck.ext2 |
45 |
- /lib/libext2fs.so.2.4 |
46 |
- /lib/libext2fs.so.2 |
47 |
- /lib/libcom_err.so.2.1 |
48 |
- /lib/libcom_err.so.2 |
49 |
- /lib/libblkid.so.1.1.0 |
50 |
- /lib/libblkid.so.1 |
51 |
- /lib/libe2p.so.2.3 |
52 |
- /lib/libe2p.so.2 |
53 |
+ /lib/libext2fs.so.* |
54 |
+ /lib/libcom_err.so.* |
55 |
+ /lib/libblkid.so.* |
56 |
+ /lib/libe2p.so.* |
57 |
/usr/lib/e2initrd_helper |
58 |
- /lib/libpthread-2.17.so |
59 |
- /lib/libpthread.so.0 |
60 |
+ /lib/libpthread* |
61 |
|
62 |
netboot2/packages/sys-fs/xfsprogs/files: |
63 |
/sbin/mkfs.xfs |
64 |
/sbin/fsck.xfs |
65 |
/sbin/xfs_repair |
66 |
- /lib/libxfs.so.0.0.0 |
67 |
- /lib/libxfs.so.0 |
68 |
- /lib/libxlog.so.0.0.0 |
69 |
- /lib/libxlog.so.0 |
70 |
- /lib/librt-2.17.so |
71 |
- /lib/librt.so.1 |
72 |
+ /lib/libxfs.so.* |
73 |
+ /lib/libxlog.so.* |
74 |
+ /lib/librt* |
75 |
|
76 |
|
77 |
netboot2/packages/sys-apps/util-linux/files: |
78 |
@@ -119,16 +109,13 @@ netboot2/packages/sys-apps/util-linux/files: |
79 |
/usr/sbin/fdformat |
80 |
/usr/bin/column |
81 |
/usr/bin/cal |
82 |
- /usr/bin/ul |
83 |
/usr/bin/cytune |
84 |
/usr/bin/chrt |
85 |
/usr/bin/rename |
86 |
/usr/bin/tailf |
87 |
- /usr/bin/setterm |
88 |
/usr/bin/colcrt |
89 |
/usr/bin/write |
90 |
/usr/bin/hexdump |
91 |
- /usr/bin/line |
92 |
/usr/bin/namei |
93 |
/usr/bin/isosize |
94 |
/usr/bin/look |
95 |
@@ -145,13 +132,9 @@ netboot2/packages/sys-apps/util-linux/files: |
96 |
/usr/bin/parisc64 |
97 |
/usr/bin/whereis |
98 |
/usr/bin/setsid |
99 |
- /usr/bin/ddate |
100 |
/usr/bin/rev |
101 |
/usr/bin/linux32 |
102 |
- /usr/bin/chkdupexe |
103 |
- /usr/bin/pg |
104 |
/usr/bin/colrm |
105 |
- /sbin/cfdisk |
106 |
/sbin/raw |
107 |
/sbin/mkfs.bfs |
108 |
/sbin/sfdisk |
109 |
@@ -159,36 +142,28 @@ netboot2/packages/sys-apps/util-linux/files: |
110 |
/sbin/hwclock |
111 |
/sbin/ctrlaltdel |
112 |
/sbin/mkfs |
113 |
- /sbin/mkfs.cramfs |
114 |
/sbin/mkfs.minix |
115 |
/sbin/blockdev |
116 |
/sbin/losetup |
117 |
- /sbin/fsck.cramfs |
118 |
/sbin/agetty |
119 |
/sbin/mkswap |
120 |
/sbin/pivot_root |
121 |
/sbin/fdisk |
122 |
/sbin/swapon |
123 |
- /bin/more |
124 |
/bin/umount |
125 |
/bin/dmesg |
126 |
/bin/mount |
127 |
/sbin/swapoff |
128 |
- /lib/libblkid.so.1 |
129 |
- /lib/libblkid.so.1.1.0 |
130 |
- /lib/libmount.so.1 |
131 |
- /lib/libmount.so.1.1.0 |
132 |
- /lib/libuuid.so.1 |
133 |
- /lib/libuuid.so.1.3.0 |
134 |
+ /lib/libblkid.so.* |
135 |
+ /lib/libmount.so.* |
136 |
+ /lib/libuuid.so.* |
137 |
|
138 |
netboot2/packages/app-editors/nano/files: |
139 |
/bin/nano |
140 |
|
141 |
netboot2/packages/sys-libs/ncurses/files: |
142 |
- /lib/libncurses.so.5.9 |
143 |
- /lib/libncurses.so.5 |
144 |
- /lib/libncursesw.so.5.9 |
145 |
- /lib/libncursesw.so.5 |
146 |
+ /lib/libncurses.so.* |
147 |
+ /lib/libncursesw.so.* |
148 |
/etc/terminfo |
149 |
/usr/lib/terminfo |
150 |
/usr/share/tabset/std |
151 |
@@ -213,24 +188,18 @@ netboot2/packages/sys-libs/ncurses/files: |
152 |
|
153 |
netboot2/packages/net-misc/wget/files: |
154 |
/usr/bin/wget |
155 |
- /lib/libss.so.2.0 |
156 |
- /lib/libss.so.2 |
157 |
- /lib/libz.so.1.2.7 |
158 |
- /lib/libz.so.1 |
159 |
+ /lib/libss.so.* |
160 |
+ /lib/libz.so.* |
161 |
|
162 |
netboot2/packages/dev-libs/openssl/files: |
163 |
- /usr/lib/libssl.so.1.0.0 |
164 |
- /usr/lib/libssl.so |
165 |
- /usr/lib/libcrypto.so.1.0.0 |
166 |
- /usr/lib/libcrypto.so |
167 |
+ /usr/lib/libssl.so* |
168 |
+ /usr/lib/libcrypto.so* |
169 |
|
170 |
netboot2/packages/net-misc/rsync/files: |
171 |
/usr/bin/rsync |
172 |
|
173 |
netboot2/packages/dev-libs/popt/files: |
174 |
- usr/lib/libpopt.so.0.0.0 |
175 |
- /usr/lib/libpopt.so.0 |
176 |
- /usr/lib/libpopt.so |
177 |
+ /usr/lib/libpopt.so* |
178 |
|
179 |
netboot2/packages/net-misc/dropbear/files: |
180 |
/usr/bin/dbclient |
181 |
@@ -239,23 +208,19 @@ netboot2/packages/net-misc/dropbear/files: |
182 |
/usr/bin/dropbearkey |
183 |
/usr/bin/dropbearmulti |
184 |
/usr/sbin/dropbear |
185 |
- /lib/libcrypt-2.17.so |
186 |
- /lib/libcrypt.so.1 |
187 |
- /lib/libnss_compat-2.17.so |
188 |
- /lib/libnss_compat.so.2 |
189 |
- /lib/libnsl-2.17.so |
190 |
- /lib/libnsl.so.1 |
191 |
+ /lib/libcrypt* |
192 |
+ /lib/libnss_compat* |
193 |
+ /lib/libnsl* |
194 |
+ /lib/libresolv* |
195 |
+ /lib/libnss_dns* |
196 |
|
197 |
netboot2/packages/dev-libs/libtommath/files: |
198 |
- /usr/lib/libtommath.so.0.0.41 |
199 |
- /usr/lib/libtommath.so.0 |
200 |
+ /usr/lib/libtommath.so* |
201 |
/usr/lib/libtommath.so |
202 |
- /lib/libutil-2.17.so |
203 |
- /lib/libutil.so.1 |
204 |
+ /lib/libutil* |
205 |
|
206 |
netboot2/packages/app-misc/screen/files: |
207 |
/usr/bin/screen |
208 |
/etc/screenrc |
209 |
- /lib/libdl-2.17.so |
210 |
- /lib/libdl.so.2 |
211 |
+ /lib/libdl* |
212 |
|
213 |
|
214 |
diff --git a/releases/weekly/specs/hppa/netboot2-hppa64.spec b/releases/weekly/specs/hppa/netboot2-hppa64.spec |
215 |
index db95e6d..cbee938 100644 |
216 |
--- a/releases/weekly/specs/hppa/netboot2-hppa64.spec |
217 |
+++ b/releases/weekly/specs/hppa/netboot2-hppa64.spec |
218 |
@@ -1,6 +1,6 @@ |
219 |
# HPPA Netboot spec file by Guy Martin |
220 |
-version_stamp: 20130927 |
221 |
-snapshot: 20130927 |
222 |
+version_stamp: 20130927 |
223 |
+snapshot: 20130927 |
224 |
source_subpath: default/stage3-hppa2.0-20130927 |
225 |
|
226 |
# these shouldn't change |
227 |
@@ -11,11 +11,9 @@ profile: default/linux/hppa/13.0 |
228 |
|
229 |
boot/kernel: netboot64 |
230 |
boot/kernel/netboot64/sources: sys-kernel/gentoo-sources |
231 |
-boot/kernel/netboot64/config: /root/gmsoft-specs/netboot-3.10.7-gentoo-netboot64.config |
232 |
+boot/kernel/netboot64/config: /root/releng/releases/weekly/kconfig/hppa/netboot-3.10.7-gentoo-netboot64.config |
233 |
boot/kernel/netboot64/gk_kernargs: --arch-override=parisc --kernel-cross-compile=hppa64-unknown-linux-gnu- --all-ramdisk-modules |
234 |
|
235 |
-#netboot2/busybox_config: /root/myspecs/busybox-config |
236 |
- |
237 |
netboot2/use: |
238 |
-* |
239 |
multicall |
240 |
@@ -81,28 +79,20 @@ netboot2/packages/sys-fs/e2fsprogs/files: |
241 |
/sbin/fsck.ext4 |
242 |
/sbin/fsck.ext3 |
243 |
/sbin/fsck.ext2 |
244 |
- /lib/libext2fs.so.2.4 |
245 |
- /lib/libext2fs.so.2 |
246 |
- /lib/libcom_err.so.2.1 |
247 |
- /lib/libcom_err.so.2 |
248 |
- /lib/libblkid.so.1.1.0 |
249 |
- /lib/libblkid.so.1 |
250 |
- /lib/libe2p.so.2.3 |
251 |
- /lib/libe2p.so.2 |
252 |
+ /lib/libext2fs.so.* |
253 |
+ /lib/libcom_err.so.* |
254 |
+ /lib/libblkid.so.* |
255 |
+ /lib/libe2p.so.* |
256 |
/usr/lib/e2initrd_helper |
257 |
- /lib/libpthread-2.17.so |
258 |
- /lib/libpthread.so.0 |
259 |
+ /lib/libpthread* |
260 |
|
261 |
netboot2/packages/sys-fs/xfsprogs/files: |
262 |
/sbin/mkfs.xfs |
263 |
/sbin/fsck.xfs |
264 |
/sbin/xfs_repair |
265 |
- /lib/libxfs.so.0.0.0 |
266 |
- /lib/libxfs.so.0 |
267 |
- /lib/libxlog.so.0.0.0 |
268 |
- /lib/libxlog.so.0 |
269 |
- /lib/librt-2.17.so |
270 |
- /lib/librt.so.1 |
271 |
+ /lib/libxfs.so.* |
272 |
+ /lib/libxlog.so.* |
273 |
+ /lib/librt* |
274 |
|
275 |
|
276 |
netboot2/packages/sys-apps/util-linux/files: |
277 |
@@ -121,16 +111,13 @@ netboot2/packages/sys-apps/util-linux/files: |
278 |
/usr/sbin/fdformat |
279 |
/usr/bin/column |
280 |
/usr/bin/cal |
281 |
- /usr/bin/ul |
282 |
/usr/bin/cytune |
283 |
/usr/bin/chrt |
284 |
/usr/bin/rename |
285 |
/usr/bin/tailf |
286 |
- /usr/bin/setterm |
287 |
/usr/bin/colcrt |
288 |
/usr/bin/write |
289 |
/usr/bin/hexdump |
290 |
- /usr/bin/line |
291 |
/usr/bin/namei |
292 |
/usr/bin/isosize |
293 |
/usr/bin/look |
294 |
@@ -147,13 +134,9 @@ netboot2/packages/sys-apps/util-linux/files: |
295 |
/usr/bin/parisc64 |
296 |
/usr/bin/whereis |
297 |
/usr/bin/setsid |
298 |
- /usr/bin/ddate |
299 |
/usr/bin/rev |
300 |
/usr/bin/linux32 |
301 |
- /usr/bin/chkdupexe |
302 |
- /usr/bin/pg |
303 |
/usr/bin/colrm |
304 |
- /sbin/cfdisk |
305 |
/sbin/raw |
306 |
/sbin/mkfs.bfs |
307 |
/sbin/sfdisk |
308 |
@@ -161,36 +144,28 @@ netboot2/packages/sys-apps/util-linux/files: |
309 |
/sbin/hwclock |
310 |
/sbin/ctrlaltdel |
311 |
/sbin/mkfs |
312 |
- /sbin/mkfs.cramfs |
313 |
/sbin/mkfs.minix |
314 |
/sbin/blockdev |
315 |
/sbin/losetup |
316 |
- /sbin/fsck.cramfs |
317 |
/sbin/agetty |
318 |
/sbin/mkswap |
319 |
/sbin/pivot_root |
320 |
/sbin/fdisk |
321 |
/sbin/swapon |
322 |
- /bin/more |
323 |
/bin/umount |
324 |
/bin/dmesg |
325 |
/bin/mount |
326 |
/sbin/swapoff |
327 |
- /lib/libblkid.so.1 |
328 |
- /lib/libblkid.so.1.1.0 |
329 |
- /lib/libmount.so.1 |
330 |
- /lib/libmount.so.1.1.0 |
331 |
- /lib/libuuid.so.1 |
332 |
- /lib/libuuid.so.1.3.0 |
333 |
+ /lib/libblkid.so.* |
334 |
+ /lib/libmount.so.* |
335 |
+ /lib/libuuid.so.* |
336 |
|
337 |
netboot2/packages/app-editors/nano/files: |
338 |
/bin/nano |
339 |
|
340 |
netboot2/packages/sys-libs/ncurses/files: |
341 |
- /lib/libncurses.so.5.9 |
342 |
- /lib/libncurses.so.5 |
343 |
- /lib/libncursesw.so.5.9 |
344 |
- /lib/libncursesw.so.5 |
345 |
+ /lib/libncurses.so.* |
346 |
+ /lib/libncursesw.so.* |
347 |
/etc/terminfo |
348 |
/usr/lib/terminfo |
349 |
/usr/share/tabset/std |
350 |
@@ -215,24 +190,18 @@ netboot2/packages/sys-libs/ncurses/files: |
351 |
|
352 |
netboot2/packages/net-misc/wget/files: |
353 |
/usr/bin/wget |
354 |
- /lib/libss.so.2.0 |
355 |
- /lib/libss.so.2 |
356 |
- /lib/libz.so.1.2.7 |
357 |
- /lib/libz.so.1 |
358 |
+ /lib/libss.so.* |
359 |
+ /lib/libz.so.* |
360 |
|
361 |
netboot2/packages/dev-libs/openssl/files: |
362 |
- /usr/lib/libssl.so.1.0.0 |
363 |
- /usr/lib/libssl.so |
364 |
- /usr/lib/libcrypto.so.1.0.0 |
365 |
- /usr/lib/libcrypto.so |
366 |
+ /usr/lib/libssl.so* |
367 |
+ /usr/lib/libcrypto.so* |
368 |
|
369 |
netboot2/packages/net-misc/rsync/files: |
370 |
/usr/bin/rsync |
371 |
|
372 |
netboot2/packages/dev-libs/popt/files: |
373 |
- usr/lib/libpopt.so.0.0.0 |
374 |
- /usr/lib/libpopt.so.0 |
375 |
- /usr/lib/libpopt.so |
376 |
+ /usr/lib/libpopt.so* |
377 |
|
378 |
netboot2/packages/net-misc/dropbear/files: |
379 |
/usr/bin/dbclient |
380 |
@@ -241,23 +210,19 @@ netboot2/packages/net-misc/dropbear/files: |
381 |
/usr/bin/dropbearkey |
382 |
/usr/bin/dropbearmulti |
383 |
/usr/sbin/dropbear |
384 |
- /lib/libcrypt-2.17.so |
385 |
- /lib/libcrypt.so.1 |
386 |
- /lib/libnss_compat-2.17.so |
387 |
- /lib/libnss_compat.so.2 |
388 |
- /lib/libnsl-2.17.so |
389 |
- /lib/libnsl.so.1 |
390 |
+ /lib/libcrypt* |
391 |
+ /lib/libnss_compat* |
392 |
+ /lib/libnsl* |
393 |
+ /lib/libresolv* |
394 |
+ /lib/libnss_dns* |
395 |
|
396 |
netboot2/packages/dev-libs/libtommath/files: |
397 |
- /usr/lib/libtommath.so.0.0.41 |
398 |
- /usr/lib/libtommath.so.0 |
399 |
+ /usr/lib/libtommath.so* |
400 |
/usr/lib/libtommath.so |
401 |
- /lib/libutil-2.17.so |
402 |
- /lib/libutil.so.1 |
403 |
+ /lib/libutil* |
404 |
|
405 |
netboot2/packages/app-misc/screen/files: |
406 |
/usr/bin/screen |
407 |
/etc/screenrc |
408 |
- /lib/libdl-2.17.so |
409 |
- /lib/libdl.so.2 |
410 |
+ /lib/libdl* |