From 4ed3c02ea3b8731ef2a19404b383587e292da9a9 Mon Sep 17 00:00:00 2001
From: Wouter R <gennerate@zonnet.nl>
Date: Tue, 22 Oct 2013 18:32:53 +0200
Subject: [PATCH] Changes to use external doodle3d-client package instead of
 submodule.

---
 Makefile                                    | 9 ++-------
 extra/scripts/create-wifibox-updates-dir.sh | 3 ++-
 src/www                                     | 1 -
 3 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 160000 src/www

diff --git a/Makefile b/Makefile
index 024f60e..0e71e86 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ define Package/wifibox
 #	DEFAULT:=y
 	TITLE:=Doodle3D WifiBox firmware
 	URL:=http://www.doodle3d.com/wifibox
-	DEPENDS:=+lua +luafilesystem +libuci-lua +libiwinfo-lua +uhttpd +uhttpd-mod-lua +print3d
+	DEPENDS:=+lua +luafilesystem +libuci-lua +libiwinfo-lua +uhttpd +uhttpd-mod-lua +doodle3d-client +print3d
 endef
 
 define Package/wifibox/description
@@ -106,20 +106,15 @@ define Package/wifibox/install
 	$(INSTALL_BIN) $(WIFIBOX_BASE_DIR)/script/signin.sh $(1)/$(TGT_LUA_DIR_SUFFIX)/script
 	
 	$(CP) $(WIFIBOX_BASE_DIR)/script/wifibox.uci.config $(1)/etc/config/wifibox  # copy base configuration to uci config dir
-
 	$(CP) $(WIFIBOX_BASE_DIR)/FIRMWARE-VERSION $(1)/etc/wifibox-version
 	
-#	$(INSTALL_DIR) $(1)/$(TGT_LUA_DIR_SUFFIX)/www
-#	$(CP) $(WIFIBOX_BASE_DIR)/www/* $(1)/$(TGT_LUA_DIR_SUFFIX)/www/
-	$(CP) $(WIFIBOX_BASE_DIR)/www/* $(1)/www/  #copy www files directly to /www
-
 ifeq ($(CONFIG_WIFIBOX_DEVEL_PACKAGE),y)
 #	$(INSTALL_DIR) $(1)/$(TGT_LUA_DIR_SUFFIX)/misc
 #	$(CP) $(WIFIBOX_BASE_DIR)/../misc/collect-code.sh $(1)/$(TGT_LUA_DIR_SUFFIX)/misc/
 
 	$(INSTALL_DIR) $(1)/$(TGT_LUA_DIR_SUFFIX)/test
 	$(CP) $(WIFIBOX_BASE_DIR)/test/* $(1)/$(TGT_LUA_DIR_SUFFIX)/test/
-	$(LN) -s /$(TGT_LUA_DIR_SUFFIX)/test $(1)/www/
+#	$(LN) -s /$(TGT_LUA_DIR_SUFFIX)/test $(1)/www/
 endif
 	
 	
diff --git a/extra/scripts/create-wifibox-updates-dir.sh b/extra/scripts/create-wifibox-updates-dir.sh
index 2e6dab4..4b7ef4b 100755
--- a/extra/scripts/create-wifibox-updates-dir.sh
+++ b/extra/scripts/create-wifibox-updates-dir.sh
@@ -108,8 +108,9 @@ echo "Using $PKG_DEST_DIR as target directory"
 #clear directory and copy package files
 if [ ! -d $PKG_FEED_DIR ]; then mkdir $PKG_FEED_DIR; fi
 cp $PKG_SRC_DIR/wifibox*.ipk $PKG_FEED_DIR
-cp $PKG_SRC_DIR/ultifi*.ipk $PKG_FEED_DIR
+cp $PKG_SRC_DIR/doodle3d-client*.ipk $PKG_FEED_DIR
 cp $PKG_SRC_DIR/print3d*.ipk $PKG_FEED_DIR
+cp $PKG_SRC_DIR/ultifi*.ipk $PKG_FEED_DIR
 rm -f $PKG_FEED_DIR/$INDEX_FILE
 rm -f $PKG_FEED_DIR/$INDEX_GZ_FILE
 
diff --git a/src/www b/src/www
deleted file mode 160000
index 10724b1..0000000
--- a/src/www
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 10724b17469371570f49804a7aed5ee2c0641ce6