e2fsprogs: removed blkid stuff (now belongs to util-linux-ng)

diff --git a/e2fsprogs/.footprint b/e2fsprogs/.footprint
index d8a6fad84b78157933cebaff132a6cd10ce4f122..f4b36619da2715f3c601e43510aa5d4cecbee61e 100644 (file)
--- a/e2fsprogs/.footprint
+++ b/e2fsprogs/.footprint
@@ -1,8 +1,6 @@
 drwxr-xr-x     root/root       etc/
 -rw-r--r--     root/root       etc/mke2fs.conf
 drwxr-xr-x     root/root       lib/
-lrwxrwxrwx     root/root       lib/libblkid.so.1 -> libblkid.so.1.0
--rwxr-xr-x     root/root       lib/libblkid.so.1.0
 lrwxrwxrwx     root/root       lib/libcom_err.so.2 -> libcom_err.so.2.1
 -rwxr-xr-x     root/root       lib/libcom_err.so.2.1
 lrwxrwxrwx     root/root       lib/libe2p.so.2 -> libe2p.so.2.3
@@ -11,16 +9,12 @@ lrwxrwxrwx   root/root       lib/libext2fs.so.2 -> libext2fs.so.2.4
 -rwxr-xr-x     root/root       lib/libext2fs.so.2.4
 lrwxrwxrwx     root/root       lib/libss.so.2 -> libss.so.2.0
 -rwxr-xr-x     root/root       lib/libss.so.2.0
-lrwxrwxrwx     root/root       lib/libuuid.so.1 -> libuuid.so.1.2
--rwxr-xr-x     root/root       lib/libuuid.so.1.2
 drwxr-xr-x     root/root       sbin/
 -rwxr-xr-x     root/root       sbin/badblocks
--rwxr-xr-x     root/root       sbin/blkid
 -rwxr-xr-x     root/root       sbin/dumpe2fs
 -rwxr-xr-x     root/root       sbin/e2fsck
 lrwxrwxrwx     root/root       sbin/e2label -> tune2fs
 -rwxr-xr-x     root/root       sbin/e2undo
-lrwxrwxrwx     root/root       sbin/findfs -> tune2fs
 -rwxr-xr-x     root/root       sbin/fsck
 lrwxrwxrwx     root/root       sbin/fsck.ext2 -> e2fsck
 lrwxrwxrwx     root/root       sbin/fsck.ext3 -> e2fsck
@@ -40,11 +34,7 @@ drwxr-xr-x   root/root       usr/bin/
 -rwxr-xr-x     root/root       usr/bin/compile_et
 -rwxr-xr-x     root/root       usr/bin/lsattr
 -rwxr-xr-x     root/root       usr/bin/mk_cmds
--rwxr-xr-x     root/root       usr/bin/uuidgen
 drwxr-xr-x     root/root       usr/include/
-drwxr-xr-x     root/root       usr/include/blkid/
--rw-r--r--     root/root       usr/include/blkid/blkid.h
--rw-r--r--     root/root       usr/include/blkid/blkid_types.h
 drwxr-xr-x     root/root       usr/include/e2p/
 -rw-r--r--     root/root       usr/include/e2p/e2p.h
 drwxr-xr-x     root/root       usr/include/et/
@@ -62,11 +52,7 @@ drwxr-xr-x   root/root       usr/include/ext2fs/
 drwxr-xr-x     root/root       usr/include/ss/
 -rw-r--r--     root/root       usr/include/ss/ss.h
 -rw-r--r--     root/root       usr/include/ss/ss_err.h
-drwxr-xr-x     root/root       usr/include/uuid/
--rw-r--r--     root/root       usr/include/uuid/uuid.h
 drwxr-xr-x     root/root       usr/lib/
--rw-r--r--     root/root       usr/lib/libblkid.a
-lrwxrwxrwx     root/root       usr/lib/libblkid.so -> /lib/libblkid.so.1
 -rw-r--r--     root/root       usr/lib/libcom_err.a
 lrwxrwxrwx     root/root       usr/lib/libcom_err.so -> /lib/libcom_err.so.2
 -rw-r--r--     root/root       usr/lib/libe2p.a
@@ -75,49 +61,30 @@ lrwxrwxrwx  root/root       usr/lib/libe2p.so -> /lib/libe2p.so.2
 lrwxrwxrwx     root/root       usr/lib/libext2fs.so -> /lib/libext2fs.so.2
 -rw-r--r--     root/root       usr/lib/libss.a
 lrwxrwxrwx     root/root       usr/lib/libss.so -> /lib/libss.so.2
--rw-r--r--     root/root       usr/lib/libuuid.a
-lrwxrwxrwx     root/root       usr/lib/libuuid.so -> /lib/libuuid.so.1
 drwxr-xr-x     root/root       usr/lib/pkgconfig/
--rw-r--r--     root/root       usr/lib/pkgconfig/blkid.pc
 -rw-r--r--     root/root       usr/lib/pkgconfig/com_err.pc
 -rw-r--r--     root/root       usr/lib/pkgconfig/e2p.pc
 -rw-r--r--     root/root       usr/lib/pkgconfig/ext2fs.pc
 -rw-r--r--     root/root       usr/lib/pkgconfig/ss.pc
--rw-r--r--     root/root       usr/lib/pkgconfig/uuid.pc
 drwxr-xr-x     root/root       usr/man/
 drwxr-xr-x     root/root       usr/man/man1/
 -rw-r--r--     root/root       usr/man/man1/chattr.1.gz
 -rw-r--r--     root/root       usr/man/man1/compile_et.1.gz
 -rw-r--r--     root/root       usr/man/man1/lsattr.1.gz
 -rw-r--r--     root/root       usr/man/man1/mk_cmds.1.gz
--rw-r--r--     root/root       usr/man/man1/uuidgen.1.gz
 drwxr-xr-x     root/root       usr/man/man3/
 -rw-r--r--     root/root       usr/man/man3/com_err.3.gz
--rw-r--r--     root/root       usr/man/man3/libblkid.3.gz
--rw-r--r--     root/root       usr/man/man3/uuid.3.gz
--rw-r--r--     root/root       usr/man/man3/uuid_clear.3.gz
--rw-r--r--     root/root       usr/man/man3/uuid_compare.3.gz
--rw-r--r--     root/root       usr/man/man3/uuid_copy.3.gz
--rw-r--r--     root/root       usr/man/man3/uuid_generate.3.gz
-lrwxrwxrwx     root/root       usr/man/man3/uuid_generate_random.3.gz -> uuid_generate.3.gz
-lrwxrwxrwx     root/root       usr/man/man3/uuid_generate_time.3.gz -> uuid_generate.3.gz
--rw-r--r--     root/root       usr/man/man3/uuid_is_null.3.gz
--rw-r--r--     root/root       usr/man/man3/uuid_parse.3.gz
--rw-r--r--     root/root       usr/man/man3/uuid_time.3.gz
--rw-r--r--     root/root       usr/man/man3/uuid_unparse.3.gz
 drwxr-xr-x     root/root       usr/man/man5/
 -rw-r--r--     root/root       usr/man/man5/e2fsck.conf.5.gz
 -rw-r--r--     root/root       usr/man/man5/mke2fs.conf.5.gz
 drwxr-xr-x     root/root       usr/man/man8/
 -rw-r--r--     root/root       usr/man/man8/badblocks.8.gz
--rw-r--r--     root/root       usr/man/man8/blkid.8.gz
 -rw-r--r--     root/root       usr/man/man8/dumpe2fs.8.gz
 -rw-r--r--     root/root       usr/man/man8/e2freefrag.8.gz
 -rw-r--r--     root/root       usr/man/man8/e2fsck.8.gz
 -rw-r--r--     root/root       usr/man/man8/e2label.8.gz
 -rw-r--r--     root/root       usr/man/man8/e2undo.8.gz
 -rw-r--r--     root/root       usr/man/man8/filefrag.8.gz
--rw-r--r--     root/root       usr/man/man8/findfs.8.gz
 -rw-r--r--     root/root       usr/man/man8/fsck.8.gz
 lrwxrwxrwx     root/root       usr/man/man8/fsck.ext2.8.gz -> e2fsck.8.gz
 lrwxrwxrwx     root/root       usr/man/man8/fsck.ext3.8.gz -> e2fsck.8.gz
@@ -132,12 +99,10 @@ lrwxrwxrwx root/root       usr/man/man8/mkfs.ext4dev.8.gz -> mke2fs.8.gz
 -rw-r--r--     root/root       usr/man/man8/mklost+found.8.gz
 -rw-r--r--     root/root       usr/man/man8/resize2fs.8.gz
 -rw-r--r--     root/root       usr/man/man8/tune2fs.8.gz
--rw-r--r--     root/root       usr/man/man8/uuidd.8.gz
 drwxr-xr-x     root/root       usr/sbin/
 -rwxr-xr-x     root/root       usr/sbin/e2freefrag
 -rwxr-xr-x     root/root       usr/sbin/filefrag
 -rwxr-xr-x     root/root       usr/sbin/mklost+found
--rwxr-xr-x     root/root       usr/sbin/uuidd
 drwxr-xr-x     root/root       usr/share/
 drwxr-xr-x     root/root       usr/share/et/
 -rw-r--r--     root/root       usr/share/et/et_c.awk

diff --git a/e2fsprogs/Pkgfile b/e2fsprogs/Pkgfile
index 14c90041cc9926deaab0bf910a272122e73be01b..24ddaa4c80a0b4b13a1a8961255738b1b4f14423 100644 (file)
--- a/e2fsprogs/Pkgfile
+++ b/e2fsprogs/Pkgfile
@@ -6,7 +6,7 @@
 
 name=e2fsprogs
 version=1.41.9
-release=1
+release=2
 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz \
         $name-symlink.patch)
 
@@ -24,7 +24,10 @@ build() {
               --disable-imager \
               --disable-e2initrd-helper \
               --disable-evms \
-              --disable-nls
+              --disable-nls \
+              --disable-libblkid \
+              --disable-libuuid \
+              --disable-uuidd
 
   make
   make DESTDIR=$PKG install install-libs