Fix cryptsetup/e2fsprogs dependencies.

diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
index 419c64d506d6d40da9c166572e0cf4fd36613452..a0cad181c35516f79db4405324ea9b125b369b45 100644 (file)
--- a/package/cryptsetup/cryptsetup.mk
+++ b/package/cryptsetup/cryptsetup.mk
@@ -47,7 +47,7 @@ $(TARGET_DIR)/$(CRYPTSETUP_TARGET_BINARY): $(CRYPTSETUP_DIR)/$(CRYPTSETUP_BINARY
        $(STRIPCMD) $(TARGET_DIR)/$(CRYPTSETUP_TARGET_BINARY)
 
 
-cryptsetup: libgcrypt libgpg-error popt host-e2fsprogs-uuid uclibc $(TARGET_DIR)/$(CRYPTSETUP_TARGET_BINARY)
+cryptsetup: libgcrypt libgpg-error popt e2fsprogs uclibc $(TARGET_DIR)/$(CRYPTSETUP_TARGET_BINARY)
 
 cryptsetup-source: $(DL_DIR)/$(CRYPTSETUP_SOURCE)
 

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index de60c6a51113a307edb4c63cf6b30ca76b510512..625c9afc7b73bd2fe3473e9757bef55692f12439 100644 (file)
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -126,17 +126,9 @@ endif
 e2fsprogs: uclibc util-linux-ng \
        $(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY)
 
-host-e2fsprogs-uuid:  $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY) $(STAGING_DIR)/usr/include/uuid/uuid.h 
-
-$(STAGING_DIR)/usr/include/uuid/uuid.h:
-       mkdir -p $(STAGING_DIR)/usr/include/uuid/
-       cp $(E2FSPROGS_DIR)/lib/uuid/uuid.h     $(STAGING_DIR)/usr/include/uuid
-       cp $(E2FSPROGS_DIR)/lib/libuuid.a $(STAGING_DIR)/usr/lib
-
 e2fsprogs-clean:
        -$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(E2FSPROGS_DIR) uninstall
        -$(MAKE1) -C $(E2FSPROGS_DIR) clean
-       rm -rf $(STAGING_DIR)/usr/include/uuid $(STAGING_DIR)/usr/lib
 
 e2fsprogs-dirclean:
        rm -rf $(E2FSPROGS_DIR)