diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-07-28 17:58:50 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-07-28 17:58:50 +0200 |
| commit | e1ffc2f791b336339909c90559b7db40b455f172 (patch) | |
| tree | abbc917d94e559a7c4882ee2d6c99d19780972e0 /package/e2fsprogs/e2fsprogs.mk | |
| parent | 43d198c051556f66ec3bb6226415dce822e7a0c4 (diff) | |
| download | buildroot-novena-e1ffc2f791b336339909c90559b7db40b455f172.tar.gz buildroot-novena-e1ffc2f791b336339909c90559b7db40b455f172.zip | |
e2fsprogs: use libblkid / blkid from util-linux
e2fsprogs and util-linux both provide blkid / libblkid causing conflicts
if both are enabled. The preferred upstream (E.G. what is used by Debian)
is util-linux, so remove the options from e2fsprogs and make it use the
util-linux version instead.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/e2fsprogs/e2fsprogs.mk')
| -rw-r--r-- | package/e2fsprogs/e2fsprogs.mk | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index e4ae86ac7..42bdd2c6a 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -15,6 +15,7 @@ E2FSPROGS_CONF_OPT = \ $(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \ $(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \ $(if $(BR2_PACKAGE_E2FSPROGS_UUIDD),,--disable-uuidd) \ + --disable-blkid \ --enable-fsck \ --disable-e2initrd-helper \ --disable-testio-debug @@ -30,7 +31,6 @@ endef # binaries to keep or remove E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BLKID) += usr/sbin/blkid E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_CHATTR) += usr/bin/chattr E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_DUMPE2FS) += usr/sbin/dumpe2fs E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FREEFRAG) += usr/sbin/e2freefrag @@ -47,7 +47,6 @@ E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UUIDGEN) += usr/bin/uuidgen # libraries to keep or remove E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LIBUUID) += usr/lib/libuuid.so* -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LIBBLKID) += usr/lib/libblkid.so* E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UTILS) += usr/lib/libcom_err.so* E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UTILS) += usr/lib/libe2p.so* E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UTILS) += usr/lib/libext2fs.so* @@ -117,18 +116,5 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_LIBUUID),y) E2FSPROGS_POST_INSTALL_STAGING_HOOKS += E2FSPROGS_STAGING_LIBUUID_INSTALL endif -define E2FSPROGS_STAGING_LIBBLKID_INSTALL - install -D $(@D)/lib/blkid/blkid.h \ - $(STAGING_DIR)/usr/include/blkid/blkid.h - install -D $(@D)/lib/blkid/blkid_types.h \ - $(STAGING_DIR)/usr/include/blkid/blkid_types.h - install -D $(@D)/lib/blkid/blkid.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/blkid.pc -endef - -ifeq ($(BR2_PACKAGE_E2FSPROGS_LIBBLKID),y) -E2FSPROGS_POST_INSTALL_STAGING_HOOKS += E2FSPROGS_STAGING_LIBBLKID_INSTALL -endif - $(eval $(call AUTOTARGETS,package,e2fsprogs)) $(eval $(call AUTOTARGETS,package,e2fsprogs,host)) |