diff options
| author | Carsten Schlote <c.schlote@konzeptpark.de> | 2010-02-01 19:42:29 +0100 |
|---|---|---|
| committer | Carsten Schlote <c.schlote@konzeptpark.de> | 2010-02-08 11:30:32 +0100 |
| commit | 6ac2968ec7487e167afcf57a5d7a38da5efa8874 (patch) | |
| tree | 5996358edf595cce52f0e41251385c2b65493728 /rules/e2fsprogs.make | |
| parent | 21231b5c6c6812d0a6d253cb6eb7e42ec869852c (diff) | |
| download | ptxdist-6ac2968ec7487e167afcf57a5d7a38da5efa8874.tar.gz ptxdist-6ac2968ec7487e167afcf57a5d7a38da5efa8874.tar.xz | |
[ptxdist] (2/4) Switch to newer versions of libuuid and libblkid
util-linux-ng provides newer versions of libblkid and libuuid
than the e2fsprogs sources do.
This patch modifies e2fsprogs and util-linux-ng:
- Disable compilation of built-in libs in
e2fsprogs
- Remove selects for e2fsprogs from utils-linux-ng
- Moved installtion of libs to ng-utils
- Commented out blkid and uuidgen from e2fsprogs
to avoid collisions.
Signed-off-by: Carsten Schlote <c.schlote@konzeptpark.de>
Acked-by: Marc Kleine-Budde <mkl@penguttronix.de>
Update: Fixed packet name for install_copy. Now uuidgen and blkid get
installed correctly. I forgot to change that after CCP from e2fstools.
Signed-off-by: Carsten Schlote <c.schlote@konzeptpark.de>
Diffstat (limited to 'rules/e2fsprogs.make')
| -rw-r--r-- | rules/e2fsprogs.make | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index f8079bd2b..36fd6c7aa 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -56,7 +56,9 @@ E2FSPROGS_AUTOCONF := \ --disable-testio-debug \ --disable-tls \ --enable-elf-shlibs \ - --enable-htree + --enable-htree \ + --disable-libblkid \ + --disable-libuuid ifdef PTXCONF_E2FSPROGS_COMPRESSION E2FSPROGS_AUTOCONF += --enable-compression @@ -109,12 +111,6 @@ $(STATEDIR)/e2fsprogs.targetinstall: # # # # libraries # # -ifdef PTXCONF_E2FSPROGS_LIBBLKID - @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ - /usr/lib/libblkid.so.1.0) - @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1) - @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so) -endif ifdef PTXCONF_E2FSPROGS_LIBCOM_ERR @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ @@ -144,14 +140,6 @@ ifdef PTXCONF_E2FSPROGS_LIBSS @$(call install_link, e2fsprogs, libss.so.2.0, /usr/lib/libss.so) endif -ifdef PTXCONF_E2FSPROGS_LIBUUID - @$(call install_copy, e2fsprogs, 0, 0, 0644, -, \ - /usr/lib/libuuid.so.1.2) - @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so.1) - @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so) -endif - - # # # # binaries in /usr/bin # # @@ -161,9 +149,6 @@ endif ifdef PTXCONF_E2FSPROGS_INSTALL_LSATTR @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/lsattr) endif -ifdef PTXCONF_E2FSPROGS_INSTALL_UUIDGEN - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/uuidgen) -endif # # @@ -173,10 +158,6 @@ ifdef PTXCONF_E2FSPROGS_INSTALL_BADBLOCKS @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/badblocks) endif -ifdef PTXCONF_E2FSPROGS_INSTALL_BLKID - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/blkid) -endif - ifdef PTXCONF_E2FSPROGS_INSTALL_DUMPE2FS @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/dumpe2fs) endif |