Merge remote-tracking branch 'origin/next'

[people/pmueller/ipfire-2.x.git] / config / rootfiles / common / e2fsprogs

diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs
index a2932906d5b8e93a5fba4dffc9f62ffe8382f01b..b3a5fe5573537b67545517b57b403f8c3ea0b407 100644 (file)
--- 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
@@ -18,19 +14,18 @@ sbin/dumpe2fs
 sbin/e2fsck
 sbin/e2image
 sbin/e2label
+sbin/e2mmpstatus
 sbin/e2undo
 sbin/findfs
 sbin/fsck
 sbin/fsck.ext2
 sbin/fsck.ext3
 sbin/fsck.ext4
-sbin/fsck.ext4dev
 #sbin/logsave
 sbin/mke2fs
 sbin/mkfs.ext2
 sbin/mkfs.ext3
 sbin/mkfs.ext4
-sbin/mkfs.ext4dev
 sbin/resize2fs
 sbin/tune2fs
 usr/bin/chattr
@@ -41,6 +36,7 @@ usr/bin/uuidgen
 #usr/include/blkid
 #usr/include/blkid/blkid.h
 #usr/include/blkid/blkid_types.h
+#usr/include/com_err.h
 #usr/include/e2p
 #usr/include/e2p/e2p.h
 #usr/include/et
@@ -54,6 +50,8 @@ usr/bin/uuidgen
 #usr/include/ext2fs/ext2_types.h
 #usr/include/ext2fs/ext2fs.h
 #usr/include/ext2fs/ext3_extents.h
+#usr/include/ext2fs/hashmap.h
+#usr/include/ext2fs/qcow2.h
 #usr/include/ext2fs/tdb.h
 #usr/include/ss
 #usr/include/ss/ss.h
@@ -61,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
@@ -73,7 +69,6 @@ usr/lib/libext2fs.so
 usr/lib/libss.so
 #usr/lib/libuuid.a
 usr/lib/libuuid.so
-#usr/lib/pkgconfig
 #usr/lib/pkgconfig/blkid.pc
 #usr/lib/pkgconfig/com_err.pc
 #usr/lib/pkgconfig/e2p.pc
@@ -81,6 +76,8 @@ usr/lib/libuuid.so
 #usr/lib/pkgconfig/ss.pc
 #usr/lib/pkgconfig/uuid.pc
 usr/sbin/e2freefrag
+usr/sbin/e4crypt
+usr/sbin/e4defrag
 usr/sbin/filefrag
 usr/sbin/mklost+found
 usr/sbin/uuidd
@@ -107,6 +104,9 @@ usr/sbin/uuidd
 #usr/share/man/man3/uuid_time.3
 #usr/share/man/man3/uuid_unparse.3
 #usr/share/man/man5/e2fsck.conf.5
+#usr/share/man/man5/ext2.5
+#usr/share/man/man5/ext3.5
+#usr/share/man/man5/ext4.5
 #usr/share/man/man5/mke2fs.conf.5
 #usr/share/man/man8/badblocks.8
 #usr/share/man/man8/blkid.8
@@ -116,20 +116,21 @@ usr/sbin/uuidd
 #usr/share/man/man8/e2fsck.8
 #usr/share/man/man8/e2image.8
 #usr/share/man/man8/e2label.8
+#usr/share/man/man8/e2mmpstatus.8
 #usr/share/man/man8/e2undo.8
+#usr/share/man/man8/e4crypt.8
+#usr/share/man/man8/e4defrag.8
 #usr/share/man/man8/filefrag.8
 #usr/share/man/man8/findfs.8
 #usr/share/man/man8/fsck.8
 #usr/share/man/man8/fsck.ext2.8
 #usr/share/man/man8/fsck.ext3.8
 #usr/share/man/man8/fsck.ext4.8
-#usr/share/man/man8/fsck.ext4dev.8
 #usr/share/man/man8/logsave.8
 #usr/share/man/man8/mke2fs.8
 #usr/share/man/man8/mkfs.ext2.8
 #usr/share/man/man8/mkfs.ext3.8
 #usr/share/man/man8/mkfs.ext4.8
-#usr/share/man/man8/mkfs.ext4dev.8
 #usr/share/man/man8/mklost+found.8
 #usr/share/man/man8/resize2fs.8
 #usr/share/man/man8/tune2fs.8