Add cryptsetup.

diff --git a/package/Config.in b/package/Config.in
index 5d45e7b0b723e41076cb338495db39fbc20ab37b..6ecf304b056ce6094d298a06677770eb644d87de 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -232,6 +232,7 @@ endmenu
 
 menu "Hardware handling / blockdevices and filesystem maintenance"
 source "package/acpid/Config.in"
+source "package/cryptsetup/Config.in"
 source "package/dbus/Config.in"
 source "package/dbus-glib/Config.in"
 source "package/devmem2/Config.in"

diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in
new file mode 100644 (file)
index 0000000..09c4353
--- /dev/null
+++ b/package/cryptsetup/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_CRYPTSETUP
+       bool "cryptsetup"
+       default n
+       select BR2_PACKAGE_LIBGCRYPT
+       select BR2_PACKAGE_POPT
+       help
+               Not avaiable
+

diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
new file mode 100644 (file)
index 0000000..cd4206a
--- /dev/null
+++ b/package/cryptsetup/cryptsetup.mk
@@ -0,0 +1,69 @@
+#############################################################
+#
+# cryptsetup
+#
+#############################################################
+CRYPTSETUP_VERSION:=1.0.7
+CRYPTSETUP_SOURCE:=cryptsetup-$(CRYPTSETUP_VERSION).tar.bz2
+CRYPTSETUP_SITE:=http://cryptsetup.googlecode.com/files
+CRYPTSETUP_DIR:=$(BUILD_DIR)/cryptsetup-$(CRYPTSETUP_VERSION)
+CRYPTSETUP_BINARY:=src/cryptsetup
+CRYPTSETUP_TARGET_BINARY:=sbin/cryptsetup
+
+$(DL_DIR)/$(CRYPTSETUP_SOURCE):
+        $(WGET) -P $(DL_DIR) $(CRYPTSETUP_SITE)/$(CRYPTSETUP_SOURCE)
+
+$(CRYPTSETUP_DIR)/.source: $(DL_DIR)/$(CRYPTSETUP_SOURCE)
+       $(BZCAT) $(DL_DIR)/$(CRYPTSETUP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+       touch $@
+
+$(CRYPTSETUP_DIR)/.configured: $(CRYPTSETUP_DIR)/.source
+       (cd $(CRYPTSETUP_DIR); rm -rf config.cache; \
+               $(TARGET_CONFIGURE_OPTS) \
+               $(TARGET_CONFIGURE_ARGS) \
+               $(TARGET_CONFIGURE_ENV) \
+               ./configure \
+               --target=$(GNU_TARGET_NAME) \
+               --host=$(GNU_TARGET_NAME) \
+               --build=$(GNU_HOST_NAME) \
+               --prefix=/usr \
+               --sysconfdir=/etc \
+               --disable-shared-library \
+               $(DISABLE_NLS); \
+               $(SED)  's:^hardcode_libdir_flag_spec.*$$:hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ ":'   -i libtool; \
+       )
+       touch $@
+
+$(CRYPTSETUP_DIR)/$(CRYPTSETUP_BINARY): $(CRYPTSETUP_DIR)/.configured 
+       $(MAKE) CC=$(TARGET_CC) -C $(CRYPTSETUP_DIR)
+
+$(TARGET_DIR)/$(CRYPTSETUP_TARGET_BINARY): $(CRYPTSETUP_DIR)/$(CRYPTSETUP_BINARY)
+       $(MAKE) prefix=$(TARGET_DIR)/usr exec_prefix=$(TARGET_DIR) -C $(CRYPTSETUP_DIR) install
+       rm $(TARGET_DIR)/lib/libcryptsetup*
+       rmdir $(TARGET_DIR)/lib/cryptsetup
+       rm $(TARGET_DIR)/usr/include/libcryptsetup.h
+       rm -Rf $(TARGET_DIR)/usr/share/man
+       $(STRIPCMD) $(TARGET_DIR)/$(CRYPTSETUP_TARGET_BINARY)
+
+
+cryptsetup: libgcrypt libgpg-error popt host-e2fsprogs-uuid uclibc $(TARGET_DIR)/$(CRYPTSETUP_TARGET_BINARY)
+
+cryptsetup-source: $(DL_DIR)/$(CRYPTSETUP_SOURCE)
+
+
+cryptsetup-clean:
+       $(MAKE) prefix=$(TARGET_DIR)/usr exec_prefix=$(TARGET_DIR) -C $(CRYPTSETUP_DIR) uninstall
+       -$(MAKE) -C $(CRYPTSETUP_DIR) clean
+
+cryptsetup-dirclean:
+       rm -rf $(CRYPTSETUP_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_CRYPTSETUP)),y)
+TARGETS+=cryptsetup
+endif
+

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 09fd53d30cbbe0ea2fca51f8dc3e8ba8809c6c8c..3e1af4f6a6b2bd3b0de287af0f74611bb085aa5f 100644 (file)
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -126,9 +126,17 @@ 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)