[gentoo-commits] proj/releng:master commit in: releases/specs/hppa/

[Matt Turner]

commit:     043f19612c1fb45338d160c27c8f88d6141e0c77
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 13 05:14:34 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 13 05:19:14 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=043f1961

specs/hppa: Ship more util-linux libs in netboot images

Also remove libblkid.so from e2fsprogs' list of files. util-linux
provides that, not e2fsprogs.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 releases/specs/hppa/netboot-hppa32.spec | 8 +++++++-
 releases/specs/hppa/netboot-hppa64.spec | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/releases/specs/hppa/netboot-hppa32.spec 
b/releases/specs/hppa/netboot-hppa32.spec
index 5a04d882..dd4eefd2 100644
--- a/releases/specs/hppa/netboot-hppa32.spec
+++ b/releases/specs/hppa/netboot-hppa32.spec
@@ -81,7 +81,6 @@ netboot/packages/sys-fs/e2fsprogs/files:
        /sbin/fsck.ext2
        /lib/libext2fs.so.*
        /lib/libcom_err.so.*
-       /lib/libblkid.so.*
        /lib/libe2p.so.*
        /usr/lib/e2initrd_helper
        /lib/libpthread*
@@ -145,8 +144,15 @@ netboot/packages/sys-apps/util-linux/files:
        /bin/mount
        /sbin/swapoff
        /lib/libblkid.so.*
+       /lib/libfdisk.so.*
        /lib/libmount.so.*
+       /lib/libsmartcols.so.*
        /lib/libuuid.so.*
+       /usr/lib/libblkid.so
+       /usr/lib/libfdisk.so
+       /usr/lib/libmount.so
+       /usr/lib/libsmartcols.so
+       /usr/lib/libuuid.so
 
 netboot/packages/app-editors/nano/files:
        /bin/nano

diff --git a/releases/specs/hppa/netboot-hppa64.spec 
b/releases/specs/hppa/netboot-hppa64.spec
index 3ce91bb2..3de1daaa 100644
--- a/releases/specs/hppa/netboot-hppa64.spec
+++ b/releases/specs/hppa/netboot-hppa64.spec
@@ -93,7 +93,6 @@ netboot/packages/sys-fs/e2fsprogs/files:
        /sbin/fsck.ext2
        /lib/libext2fs.so.*
        /lib/libcom_err.so.*
-       /lib/libblkid.so.*
        /lib/libe2p.so.*
        /usr/lib/e2initrd_helper
        /lib/libpthread*
@@ -157,8 +156,15 @@ netboot/packages/sys-apps/util-linux/files:
        /bin/mount
        /sbin/swapoff
        /lib/libblkid.so.*
+       /lib/libfdisk.so.*
        /lib/libmount.so.*
+       /lib/libsmartcols.so.*
        /lib/libuuid.so.*
+       /usr/lib/libblkid.so
+       /usr/lib/libfdisk.so
+       /usr/lib/libmount.so
+       /usr/lib/libsmartcols.so
+       /usr/lib/libuuid.so
 
 netboot/packages/app-editors/nano/files:
        /bin/nano