Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: releases/specs/hppa/
Date: Mon, 13 Sep 2021 05:19:51
Message-Id: 1631510354.043f19612c1fb45338d160c27c8f88d6141e0c77.mattst88@gentoo
1 commit: 043f19612c1fb45338d160c27c8f88d6141e0c77
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 13 05:14:34 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 13 05:19:14 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=043f1961
7
8 specs/hppa: Ship more util-linux libs in netboot images
9
10 Also remove libblkid.so from e2fsprogs' list of files. util-linux
11 provides that, not e2fsprogs.
12
13 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
14
15 releases/specs/hppa/netboot-hppa32.spec | 8 +++++++-
16 releases/specs/hppa/netboot-hppa64.spec | 8 +++++++-
17 2 files changed, 14 insertions(+), 2 deletions(-)
18
19 diff --git a/releases/specs/hppa/netboot-hppa32.spec b/releases/specs/hppa/netboot-hppa32.spec
20 index 5a04d882..dd4eefd2 100644
21 --- a/releases/specs/hppa/netboot-hppa32.spec
22 +++ b/releases/specs/hppa/netboot-hppa32.spec
23 @@ -81,7 +81,6 @@ netboot/packages/sys-fs/e2fsprogs/files:
24 /sbin/fsck.ext2
25 /lib/libext2fs.so.*
26 /lib/libcom_err.so.*
27 - /lib/libblkid.so.*
28 /lib/libe2p.so.*
29 /usr/lib/e2initrd_helper
30 /lib/libpthread*
31 @@ -145,8 +144,15 @@ netboot/packages/sys-apps/util-linux/files:
32 /bin/mount
33 /sbin/swapoff
34 /lib/libblkid.so.*
35 + /lib/libfdisk.so.*
36 /lib/libmount.so.*
37 + /lib/libsmartcols.so.*
38 /lib/libuuid.so.*
39 + /usr/lib/libblkid.so
40 + /usr/lib/libfdisk.so
41 + /usr/lib/libmount.so
42 + /usr/lib/libsmartcols.so
43 + /usr/lib/libuuid.so
44
45 netboot/packages/app-editors/nano/files:
46 /bin/nano
47
48 diff --git a/releases/specs/hppa/netboot-hppa64.spec b/releases/specs/hppa/netboot-hppa64.spec
49 index 3ce91bb2..3de1daaa 100644
50 --- a/releases/specs/hppa/netboot-hppa64.spec
51 +++ b/releases/specs/hppa/netboot-hppa64.spec
52 @@ -93,7 +93,6 @@ netboot/packages/sys-fs/e2fsprogs/files:
53 /sbin/fsck.ext2
54 /lib/libext2fs.so.*
55 /lib/libcom_err.so.*
56 - /lib/libblkid.so.*
57 /lib/libe2p.so.*
58 /usr/lib/e2initrd_helper
59 /lib/libpthread*
60 @@ -157,8 +156,15 @@ netboot/packages/sys-apps/util-linux/files:
61 /bin/mount
62 /sbin/swapoff
63 /lib/libblkid.so.*
64 + /lib/libfdisk.so.*
65 /lib/libmount.so.*
66 + /lib/libsmartcols.so.*
67 /lib/libuuid.so.*
68 + /usr/lib/libblkid.so
69 + /usr/lib/libfdisk.so
70 + /usr/lib/libmount.so
71 + /usr/lib/libsmartcols.so
72 + /usr/lib/libuuid.so
73
74 netboot/packages/app-editors/nano/files:
75 /bin/nano