From f857d913b0de6d54299d546618c9e7048170d46a Mon Sep 17 00:00:00 2001
From: Christian Limpach <Christian.Limpach@citrix.com>
Date: Fri, 8 Jan 2010 03:30:25 +0000
Subject: [PATCH] Rename cryptsetup to xcryptsetup since busybox dependencies
 are a joke...

---
 package/Config.in                                      |  2 +-
 package/e2fsprogs/e2fsprogs.mk                         |  2 +-
 package/{cryptsetup => xcryptsetup}/Config.in          |  0
 .../{cryptsetup => xcryptsetup}/luks-check-key.diff    |  0
 .../cryptsetup.mk => xcryptsetup/xcryptsetup.mk}       | 10 +++++-----
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename package/{cryptsetup => xcryptsetup}/Config.in (100%)
 rename package/{cryptsetup => xcryptsetup}/luks-check-key.diff (100%)
 rename package/{cryptsetup/cryptsetup.mk => xcryptsetup/xcryptsetup.mk} (90%)

diff --git a/package/Config.in b/package/Config.in
index 6ecf304..5601122 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -232,7 +232,7 @@ endmenu
 
 menu "Hardware handling / blockdevices and filesystem maintenance"
 source "package/acpid/Config.in"
-source "package/cryptsetup/Config.in"
+source "package/xcryptsetup/Config.in"
 source "package/dbus/Config.in"
 source "package/dbus-glib/Config.in"
 source "package/devmem2/Config.in"
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index c2ad7df..09fd53d 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -123,7 +123,7 @@ endif
 	rm -rf $(TARGET_DIR)/usr/share/doc
 	touch -c $@
 
-e2fsprogs: uclibc util-linux-ng pkgconfig \
+e2fsprogs: uclibc util-linux-ng \
 	$(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY)
 
 e2fsprogs-clean:
diff --git a/package/cryptsetup/Config.in b/package/xcryptsetup/Config.in
similarity index 100%
rename from package/cryptsetup/Config.in
rename to package/xcryptsetup/Config.in
diff --git a/package/cryptsetup/luks-check-key.diff b/package/xcryptsetup/luks-check-key.diff
similarity index 100%
rename from package/cryptsetup/luks-check-key.diff
rename to package/xcryptsetup/luks-check-key.diff
diff --git a/package/cryptsetup/cryptsetup.mk b/package/xcryptsetup/xcryptsetup.mk
similarity index 90%
rename from package/cryptsetup/cryptsetup.mk
rename to package/xcryptsetup/xcryptsetup.mk
index a0cad18..bfddfa0 100644
--- a/package/cryptsetup/cryptsetup.mk
+++ b/package/xcryptsetup/xcryptsetup.mk
@@ -47,16 +47,16 @@ $(TARGET_DIR)/$(CRYPTSETUP_TARGET_BINARY): $(CRYPTSETUP_DIR)/$(CRYPTSETUP_BINARY
 	$(STRIPCMD) $(TARGET_DIR)/$(CRYPTSETUP_TARGET_BINARY)
 
 
-cryptsetup: libgcrypt libgpg-error popt e2fsprogs uclibc $(TARGET_DIR)/$(CRYPTSETUP_TARGET_BINARY)
+xcryptsetup: libgcrypt libgpg-error popt e2fsprogs uclibc $(TARGET_DIR)/$(CRYPTSETUP_TARGET_BINARY)
 
-cryptsetup-source: $(DL_DIR)/$(CRYPTSETUP_SOURCE)
+xcryptsetup-source: $(DL_DIR)/$(CRYPTSETUP_SOURCE)
 
 
-cryptsetup-clean:
+xcryptsetup-clean:
 	$(MAKE) prefix=$(TARGET_DIR)/usr exec_prefix=$(TARGET_DIR) -C $(CRYPTSETUP_DIR) uninstall
 	-$(MAKE) -C $(CRYPTSETUP_DIR) clean
 
-cryptsetup-dirclean:
+xcryptsetup-dirclean:
 	rm -rf $(CRYPTSETUP_DIR)
 
 #############################################################
@@ -65,6 +65,6 @@ cryptsetup-dirclean:
 #
 #############################################################
 ifeq ($(strip $(BR2_PACKAGE_CRYPTSETUP)),y)
-TARGETS+=cryptsetup
+TARGETS+=xcryptsetup
 endif
 
-- 
2.39.5