From dedea348501ed3de631a5ad3bddbbe8b8b8fd290 Mon Sep 17 00:00:00 2001
From: Christian Limpach <chris@rogan.ad.xensource.com>
Date: Thu, 7 Jan 2010 01:11:46 +0000
Subject: [PATCH] Fix cryptsetup/e2fsprogs dependencies.

---
 package/cryptsetup/cryptsetup.mk | 2 +-
 package/e2fsprogs/e2fsprogs.mk   | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
index 419c64d..a0cad18 100644
--- 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 de60c6a..625c9af 100644
--- 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)
-- 
2.39.5