vmario
/
doodle3d-firmware
mirror of https://github.com/Doodle3D/doodle3d-firmware.git
0
0
Fork 0
Code Issues Releases Wiki Activity

Changes to use external doodle3d-client package instead of submodule.

This commit is contained in:
Wouter R 2013-10-22 18:32:53 +02:00
parent d069dafb5c
commit 4ed3c02ea3
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -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

3
extra/scripts/create-wifibox-updates-dir.sh
View File

@ -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

1
src/www

@ -1 +0,0 @@
Subproject commit 10724b17469371570f49804a7aed5ee2c0641ce6