This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 69b3d63b82ad63d6d0ed3334a81bfe472b81a21a (commit)
from 74d3d9cbe3e3b198e6c7a8c30ec2a0c58b6c5e2c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 69b3d63b82ad63d6d0ed3334a81bfe472b81a21a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 2 17:40:34 2021 +0000
e2fsprogs: Disable libraries provided by util-linux
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/aarch64/util-linux | 26 ++++++++++++++++++
config/rootfiles/common/armv5tel/util-linux | 26 ++++++++++++++++++
config/rootfiles/common/e2fsprogs | 6 ----
config/rootfiles/common/i586/util-linux | 26 ++++++++++++++++++
config/rootfiles/common/x86_64/util-linux | 32 ++++++++++++++++++++++
.../core/155/filelists/aarch64/util-linux | 1 +
.../112 => core/155}/filelists/armv5tel/util-linux | 0
.../{oldcore/101 => core/155}/filelists/e2fsprogs | 0
.../112 => core/155}/filelists/i586/util-linux | 0
.../112 => core/155}/filelists/x86_64/util-linux | 0
lfs/e2fsprogs | 2 ++
make.sh | 2 +-
12 files changed, 114 insertions(+), 7 deletions(-)
create mode 120000 config/rootfiles/core/155/filelists/aarch64/util-linux
copy config/rootfiles/{oldcore/112 => core/155}/filelists/armv5tel/util-linux (100%)
copy config/rootfiles/{oldcore/101 => core/155}/filelists/e2fsprogs (100%)
copy config/rootfiles/{oldcore/112 => core/155}/filelists/i586/util-linux (100%)
copy config/rootfiles/{oldcore/112 => core/155}/filelists/x86_64/util-linux (100%)
Difference in files:
diff --git a/config/rootfiles/common/aarch64/util-linux b/config/rootfiles/common/aarch64/util-linux
index 733699229..04feaf8cc 100644
--- a/config/rootfiles/common/aarch64/util-linux
+++ b/config/rootfiles/common/aarch64/util-linux
@@ -7,6 +7,7 @@ bin/umount
bin/wdctl
#etc/fcron.daily
etc/fcron.daily/trim
+lib/libblkid.so.1
lib/libblkid.so.1.1.0
lib/libfdisk.so.1
lib/libfdisk.so.1.1.0
@@ -14,14 +15,18 @@ lib/libmount.so.1
lib/libmount.so.1.1.0
lib/libsmartcols.so.1
lib/libsmartcols.so.1.1.0
+lib/libuuid.so.1
lib/libuuid.so.1.3.0
sbin/agetty
sbin/blkdiscard
+sbin/blkid
sbin/blockdev
sbin/cfdisk
sbin/chcpu
sbin/ctrlaltdel
sbin/fdisk
+sbin/findfs
+sbin/fsck
#sbin/fsck.cramfs
sbin/fsck.minix
sbin/fsfreeze
@@ -101,9 +106,12 @@ usr/bin/tailf
#usr/lib/libsmartcols.la
#usr/lib/libsmartcols.so
#usr/lib/libuuid.la
+#usr/lib/libuuid.so
+#usr/lib/pkgconfig/blkid.pc
#usr/lib/pkgconfig/fdisk.pc
#usr/lib/pkgconfig/mount.pc
#usr/lib/pkgconfig/smartcols.pc
+#usr/lib/pkgconfig/uuid.pc
usr/sbin/addpart
usr/sbin/delpart
usr/sbin/fdformat
@@ -112,6 +120,7 @@ usr/sbin/partx
#usr/sbin/readprofile
usr/sbin/resizepart
usr/sbin/rtcwake
+#usr/sbin/uuidd
#usr/share/bash-completion/completions/addpart
#usr/share/bash-completion/completions/blkdiscard
#usr/share/bash-completion/completions/blkid
@@ -244,13 +253,27 @@ usr/sbin/rtcwake
#usr/share/man/man1/taskset.1
#usr/share/man/man1/ul.1
#usr/share/man/man1/unshare.1
+#usr/share/man/man1/uuidgen.1
#usr/share/man/man1/whereis.1
+#usr/share/man/man3/libblkid.3
+#usr/share/man/man3/uuid.3
+#usr/share/man/man3/uuid_clear.3
+#usr/share/man/man3/uuid_compare.3
+#usr/share/man/man3/uuid_copy.3
+#usr/share/man/man3/uuid_generate.3
+#usr/share/man/man3/uuid_generate_random.3
+#usr/share/man/man3/uuid_generate_time.3
#usr/share/man/man3/uuid_generate_time_safe.3
+#usr/share/man/man3/uuid_is_null.3
+#usr/share/man/man3/uuid_parse.3
+#usr/share/man/man3/uuid_time.3
+#usr/share/man/man3/uuid_unparse.3
#usr/share/man/man5/fstab.5
#usr/share/man/man5/terminal-colors.d.5
#usr/share/man/man8/addpart.8
#usr/share/man/man8/agetty.8
#usr/share/man/man8/blkdiscard.8
+#usr/share/man/man8/blkid.8
#usr/share/man/man8/blockdev.8
#usr/share/man/man8/cfdisk.8
#usr/share/man/man8/chcpu.8
@@ -258,7 +281,9 @@ usr/sbin/rtcwake
#usr/share/man/man8/delpart.8
#usr/share/man/man8/fdformat.8
#usr/share/man/man8/fdisk.8
+#usr/share/man/man8/findfs.8
#usr/share/man/man8/findmnt.8
+#usr/share/man/man8/fsck.8
#usr/share/man/man8/fsck.cramfs.8
#usr/share/man/man8/fsck.minix.8
#usr/share/man/man8/fsfreeze.8
@@ -293,6 +318,7 @@ usr/sbin/rtcwake
#usr/share/man/man8/switch_root.8
#usr/share/man/man8/umount.8
#usr/share/man/man8/uname26.8
+#usr/share/man/man8/uuidd.8
#usr/share/man/man8/wdctl.8
#usr/share/man/man8/wipefs.8
#usr/share/man/man8/zramctl.8
diff --git a/config/rootfiles/common/armv5tel/util-linux b/config/rootfiles/common/armv5tel/util-linux
index 8b209e5e4..259ff0346 100644
--- a/config/rootfiles/common/armv5tel/util-linux
+++ b/config/rootfiles/common/armv5tel/util-linux
@@ -7,6 +7,7 @@ bin/umount
bin/wdctl
#etc/fcron.daily
etc/fcron.daily/trim
+lib/libblkid.so.1
lib/libblkid.so.1.1.0
lib/libfdisk.so.1
lib/libfdisk.so.1.1.0
@@ -14,14 +15,18 @@ lib/libmount.so.1
lib/libmount.so.1.1.0
lib/libsmartcols.so.1
lib/libsmartcols.so.1.1.0
+lib/libuuid.so.1
lib/libuuid.so.1.3.0
sbin/agetty
sbin/blkdiscard
+sbin/blkid
sbin/blockdev
sbin/cfdisk
sbin/chcpu
sbin/ctrlaltdel
sbin/fdisk
+sbin/findfs
+sbin/fsck
#sbin/fsck.cramfs
sbin/fsck.minix
sbin/fsfreeze
@@ -100,9 +105,12 @@ usr/lib/libmount.so
#usr/lib/libsmartcols.la
#usr/lib/libsmartcols.so
#usr/lib/libuuid.la
+#usr/lib/libuuid.so
+#usr/lib/pkgconfig/blkid.pc
#usr/lib/pkgconfig/fdisk.pc
#usr/lib/pkgconfig/mount.pc
#usr/lib/pkgconfig/smartcols.pc
+#usr/lib/pkgconfig/uuid.pc
usr/sbin/addpart
usr/sbin/delpart
usr/sbin/fdformat
@@ -111,6 +119,7 @@ usr/sbin/partx
#usr/sbin/readprofile
usr/sbin/resizepart
usr/sbin/rtcwake
+#usr/sbin/uuidd
#usr/share/bash-completion/completions/addpart
#usr/share/bash-completion/completions/blkdiscard
#usr/share/bash-completion/completions/blkid
@@ -243,13 +252,27 @@ usr/sbin/rtcwake
#usr/share/man/man1/taskset.1
#usr/share/man/man1/ul.1
#usr/share/man/man1/unshare.1
+#usr/share/man/man1/uuidgen.1
#usr/share/man/man1/whereis.1
+#usr/share/man/man3/libblkid.3
+#usr/share/man/man3/uuid.3
+#usr/share/man/man3/uuid_clear.3
+#usr/share/man/man3/uuid_compare.3
+#usr/share/man/man3/uuid_copy.3
+#usr/share/man/man3/uuid_generate.3
+#usr/share/man/man3/uuid_generate_random.3
+#usr/share/man/man3/uuid_generate_time.3
#usr/share/man/man3/uuid_generate_time_safe.3
+#usr/share/man/man3/uuid_is_null.3
+#usr/share/man/man3/uuid_parse.3
+#usr/share/man/man3/uuid_time.3
+#usr/share/man/man3/uuid_unparse.3
#usr/share/man/man5/fstab.5
#usr/share/man/man5/terminal-colors.d.5
#usr/share/man/man8/addpart.8
#usr/share/man/man8/agetty.8
#usr/share/man/man8/blkdiscard.8
+#usr/share/man/man8/blkid.8
#usr/share/man/man8/blockdev.8
#usr/share/man/man8/cfdisk.8
#usr/share/man/man8/chcpu.8
@@ -257,7 +280,9 @@ usr/sbin/rtcwake
#usr/share/man/man8/delpart.8
#usr/share/man/man8/fdformat.8
#usr/share/man/man8/fdisk.8
+#usr/share/man/man8/findfs.8
#usr/share/man/man8/findmnt.8
+#usr/share/man/man8/fsck.8
#usr/share/man/man8/fsck.cramfs.8
#usr/share/man/man8/fsck.minix.8
#usr/share/man/man8/fsfreeze.8
@@ -291,6 +316,7 @@ usr/sbin/rtcwake
#usr/share/man/man8/switch_root.8
#usr/share/man/man8/umount.8
#usr/share/man/man8/uname26.8
+#usr/share/man/man8/uuidd.8
#usr/share/man/man8/wdctl.8
#usr/share/man/man8/wipefs.8
#usr/share/man/man8/zramctl.8
diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs
index 79ac99f99..b3a5fe557 100644
--- a/config/rootfiles/common/e2fsprogs
+++ b/config/rootfiles/common/e2fsprogs
@@ -1,6 +1,4 @@
#etc/mke2fs.conf
-lib/libblkid.so.1
-lib/libblkid.so.1.0
lib/libcom_err.so.2
lib/libcom_err.so.2.1
lib/libe2p.so.2
@@ -9,8 +7,6 @@ lib/libext2fs.so.2
lib/libext2fs.so.2.4
lib/libss.so.2
lib/libss.so.2.0
-lib/libuuid.so.1
-lib/libuuid.so.1.2
sbin/badblocks
sbin/blkid
sbin/debugfs
@@ -63,8 +59,6 @@ usr/bin/uuidgen
#usr/include/uuid
#usr/include/uuid/uuid.h
#usr/lib/e2initrd_helper
-#usr/lib/libblkid.a
-usr/lib/libblkid.so
#usr/lib/libcom_err.a
usr/lib/libcom_err.so
#usr/lib/libe2p.a
diff --git a/config/rootfiles/common/i586/util-linux b/config/rootfiles/common/i586/util-linux
index d445a7f3a..e5023c4d3 100644
--- a/config/rootfiles/common/i586/util-linux
+++ b/config/rootfiles/common/i586/util-linux
@@ -7,6 +7,7 @@ bin/umount
bin/wdctl
#etc/fcron.daily
etc/fcron.daily/trim
+lib/libblkid.so.1
lib/libblkid.so.1.1.0
lib/libfdisk.so.1
lib/libfdisk.so.1.1.0
@@ -14,14 +15,18 @@ lib/libmount.so.1
lib/libmount.so.1.1.0
lib/libsmartcols.so.1
lib/libsmartcols.so.1.1.0
+lib/libuuid.so.1
lib/libuuid.so.1.3.0
sbin/agetty
sbin/blkdiscard
+sbin/blkid
sbin/blockdev
sbin/cfdisk
sbin/chcpu
sbin/ctrlaltdel
sbin/fdisk
+sbin/findfs
+sbin/fsck
#sbin/fsck.cramfs
sbin/fsck.minix
sbin/fsfreeze
@@ -101,9 +106,12 @@ usr/bin/tailf
#usr/lib/libsmartcols.la
#usr/lib/libsmartcols.so
#usr/lib/libuuid.la
+#usr/lib/libuuid.so
+#usr/lib/pkgconfig/blkid.pc
#usr/lib/pkgconfig/fdisk.pc
#usr/lib/pkgconfig/mount.pc
#usr/lib/pkgconfig/smartcols.pc
+#usr/lib/pkgconfig/uuid.pc
usr/sbin/addpart
usr/sbin/delpart
usr/sbin/fdformat
@@ -112,6 +120,7 @@ usr/sbin/partx
#usr/sbin/readprofile
usr/sbin/resizepart
usr/sbin/rtcwake
+#usr/sbin/uuidd
#usr/share/bash-completion/completions/addpart
#usr/share/bash-completion/completions/blkdiscard
#usr/share/bash-completion/completions/blkid
@@ -244,13 +253,27 @@ usr/sbin/rtcwake
#usr/share/man/man1/taskset.1
#usr/share/man/man1/ul.1
#usr/share/man/man1/unshare.1
+#usr/share/man/man1/uuidgen.1
#usr/share/man/man1/whereis.1
+#usr/share/man/man3/libblkid.3
+#usr/share/man/man3/uuid.3
+#usr/share/man/man3/uuid_clear.3
+#usr/share/man/man3/uuid_compare.3
+#usr/share/man/man3/uuid_copy.3
+#usr/share/man/man3/uuid_generate.3
+#usr/share/man/man3/uuid_generate_random.3
+#usr/share/man/man3/uuid_generate_time.3
#usr/share/man/man3/uuid_generate_time_safe.3
+#usr/share/man/man3/uuid_is_null.3
+#usr/share/man/man3/uuid_parse.3
+#usr/share/man/man3/uuid_time.3
+#usr/share/man/man3/uuid_unparse.3
#usr/share/man/man5/fstab.5
#usr/share/man/man5/terminal-colors.d.5
#usr/share/man/man8/addpart.8
#usr/share/man/man8/agetty.8
#usr/share/man/man8/blkdiscard.8
+#usr/share/man/man8/blkid.8
#usr/share/man/man8/blockdev.8
#usr/share/man/man8/cfdisk.8
#usr/share/man/man8/chcpu.8
@@ -258,7 +281,9 @@ usr/sbin/rtcwake
#usr/share/man/man8/delpart.8
#usr/share/man/man8/fdformat.8
#usr/share/man/man8/fdisk.8
+#usr/share/man/man8/findfs.8
#usr/share/man/man8/findmnt.8
+#usr/share/man/man8/fsck.8
#usr/share/man/man8/fsck.cramfs.8
#usr/share/man/man8/fsck.minix.8
#usr/share/man/man8/fsfreeze.8
@@ -293,6 +318,7 @@ usr/sbin/rtcwake
#usr/share/man/man8/switch_root.8
#usr/share/man/man8/umount.8
#usr/share/man/man8/uname26.8
+#usr/share/man/man8/uuidd.8
#usr/share/man/man8/wdctl.8
#usr/share/man/man8/wipefs.8
#usr/share/man/man8/x86_64.8
diff --git a/config/rootfiles/common/x86_64/util-linux b/config/rootfiles/common/x86_64/util-linux
index 039f87158..425e4a15c 100644
--- a/config/rootfiles/common/x86_64/util-linux
+++ b/config/rootfiles/common/x86_64/util-linux
@@ -7,6 +7,7 @@ bin/umount
bin/wdctl
#etc/fcron.daily
etc/fcron.daily/trim
+lib/libblkid.so.1
lib/libblkid.so.1.1.0
lib/libfdisk.so.1
lib/libfdisk.so.1.1.0
@@ -14,14 +15,18 @@ lib/libmount.so.1
lib/libmount.so.1.1.0
lib/libsmartcols.so.1
lib/libsmartcols.so.1.1.0
+lib/libuuid.so.1
lib/libuuid.so.1.3.0
sbin/agetty
sbin/blkdiscard
+sbin/blkid
sbin/blockdev
sbin/cfdisk
sbin/chcpu
sbin/ctrlaltdel
sbin/fdisk
+sbin/findfs
+sbin/fsck
#sbin/fsck.cramfs
sbin/fsck.minix
sbin/fsfreeze
@@ -86,15 +91,21 @@ usr/bin/tailf
#usr/bin/ul
#usr/bin/uname26
#usr/bin/unshare
+usr/bin/uuidgen
#usr/bin/whereis
usr/bin/x86_64
+#usr/include/blkid
+#usr/include/blkid/blkid.h
#usr/include/libfdisk
#usr/include/libfdisk/libfdisk.h
#usr/include/libmount
#usr/include/libmount/libmount.h
#usr/include/libsmartcols
#usr/include/libsmartcols/libsmartcols.h
+#usr/include/uuid
+#usr/include/uuid/uuid.h
#usr/lib/libblkid.la
+#usr/lib/libblkid.so
#usr/lib/libfdisk.la
#usr/lib/libfdisk.so
#usr/lib/libmount.la
@@ -102,9 +113,12 @@ usr/bin/x86_64
#usr/lib/libsmartcols.la
#usr/lib/libsmartcols.so
#usr/lib/libuuid.la
+#usr/lib/libuuid.so
+#usr/lib/pkgconfig/blkid.pc
#usr/lib/pkgconfig/fdisk.pc
#usr/lib/pkgconfig/mount.pc
#usr/lib/pkgconfig/smartcols.pc
+#usr/lib/pkgconfig/uuid.pc
usr/sbin/addpart
usr/sbin/delpart
usr/sbin/fdformat
@@ -113,6 +127,7 @@ usr/sbin/partx
#usr/sbin/readprofile
usr/sbin/resizepart
usr/sbin/rtcwake
+#usr/sbin/uuidd
#usr/share/bash-completion/completions/addpart
#usr/share/bash-completion/completions/blkdiscard
#usr/share/bash-completion/completions/blkid
@@ -245,13 +260,27 @@ usr/sbin/rtcwake
#usr/share/man/man1/taskset.1
#usr/share/man/man1/ul.1
#usr/share/man/man1/unshare.1
+#usr/share/man/man1/uuidgen.1
#usr/share/man/man1/whereis.1
+#usr/share/man/man3/libblkid.3
+#usr/share/man/man3/uuid.3
+#usr/share/man/man3/uuid_clear.3
+#usr/share/man/man3/uuid_compare.3
+#usr/share/man/man3/uuid_copy.3
+#usr/share/man/man3/uuid_generate.3
+#usr/share/man/man3/uuid_generate_random.3
+#usr/share/man/man3/uuid_generate_time.3
#usr/share/man/man3/uuid_generate_time_safe.3
+#usr/share/man/man3/uuid_is_null.3
+#usr/share/man/man3/uuid_parse.3
+#usr/share/man/man3/uuid_time.3
+#usr/share/man/man3/uuid_unparse.3
#usr/share/man/man5/fstab.5
#usr/share/man/man5/terminal-colors.d.5
#usr/share/man/man8/addpart.8
#usr/share/man/man8/agetty.8
#usr/share/man/man8/blkdiscard.8
+#usr/share/man/man8/blkid.8
#usr/share/man/man8/blockdev.8
#usr/share/man/man8/cfdisk.8
#usr/share/man/man8/chcpu.8
@@ -259,7 +288,9 @@ usr/sbin/rtcwake
#usr/share/man/man8/delpart.8
#usr/share/man/man8/fdformat.8
#usr/share/man/man8/fdisk.8
+#usr/share/man/man8/findfs.8
#usr/share/man/man8/findmnt.8
+#usr/share/man/man8/fsck.8
#usr/share/man/man8/fsck.cramfs.8
#usr/share/man/man8/fsck.minix.8
#usr/share/man/man8/fsfreeze.8
@@ -294,6 +325,7 @@ usr/sbin/rtcwake
#usr/share/man/man8/switch_root.8
#usr/share/man/man8/umount.8
#usr/share/man/man8/uname26.8
+#usr/share/man/man8/uuidd.8
#usr/share/man/man8/wdctl.8
#usr/share/man/man8/wipefs.8
#usr/share/man/man8/x86_64.8
diff --git a/config/rootfiles/core/155/filelists/aarch64/util-linux b/config/rootfiles/core/155/filelists/aarch64/util-linux
new file mode 120000
index 000000000..9c253c689
--- /dev/null
+++ b/config/rootfiles/core/155/filelists/aarch64/util-linux
@@ -0,0 +1 @@
+../../../../common/aarch64/util-linux
\ No newline at end of file
diff --git a/config/rootfiles/core/155/filelists/armv5tel/util-linux b/config/rootfiles/core/155/filelists/armv5tel/util-linux
new file mode 120000
index 000000000..2596908cc
--- /dev/null
+++ b/config/rootfiles/core/155/filelists/armv5tel/util-linux
@@ -0,0 +1 @@
+../../../../common/armv5tel/util-linux
\ No newline at end of file
diff --git a/config/rootfiles/core/155/filelists/e2fsprogs b/config/rootfiles/core/155/filelists/e2fsprogs
new file mode 120000
index 000000000..37b55de69
--- /dev/null
+++ b/config/rootfiles/core/155/filelists/e2fsprogs
@@ -0,0 +1 @@
+../../../common/e2fsprogs
\ No newline at end of file
diff --git a/config/rootfiles/core/155/filelists/i586/util-linux b/config/rootfiles/core/155/filelists/i586/util-linux
new file mode 120000
index 000000000..c973106f1
--- /dev/null
+++ b/config/rootfiles/core/155/filelists/i586/util-linux
@@ -0,0 +1 @@
+../../../../common/i586/util-linux
\ No newline at end of file
diff --git a/config/rootfiles/core/155/filelists/x86_64/util-linux b/config/rootfiles/core/155/filelists/x86_64/util-linux
new file mode 120000
index 000000000..7b5558d2c
--- /dev/null
+++ b/config/rootfiles/core/155/filelists/x86_64/util-linux
@@ -0,0 +1 @@
+../../../../common/x86_64/util-linux
\ No newline at end of file
diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index 8fda71389..bb005ae02 100644
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -76,6 +76,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--prefix=/usr \
--with-root-prefix="" \
--enable-elf-shlibs \
+ --disable-libblkid \
+ --disable-libuuid \
--disable-nls
cd $(DIR_APP)/build && make $(MAKETUNING)
diff --git a/make.sh b/make.sh
index cc19432ac..43cccaca0 100755
--- a/make.sh
+++ b/make.sh
@@ -1104,7 +1104,6 @@ buildbase() {
lfsmake2 acl
lfsmake2 bash
lfsmake2 diffutils
- lfsmake2 e2fsprogs
lfsmake2 ed
lfsmake2 findutils
lfsmake2 flex
@@ -1133,6 +1132,7 @@ buildbase() {
lfsmake2 texinfo
lfsmake2 util-linux
lfsmake2 vim
+ lfsmake2 e2fsprogs
}
buildipfire() {
hooks/post-receive
--
IPFire 2.x development tree