Use submodule for uimg

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "tools/uimg-tool"]
+	path = tools/uimg-tool
+	url = [email protected]:fesc2000/uimg-tool.git

README-6591.md

@@ -115,9 +115,9 @@ Steps:
     If you have an existing update image you want to install, you can extract these bin
     files from it using the uimg tool. For example:
 
-        make -C src/uimg
+        make -C tools/uimg-tool
         tar xf FRITZ.Box_6591_Cable-07.19-80492-Labor.image ./var/firmware-update.uimg
-        src/uimg/uimg -u -n part ./var/firmware-update.uimg
+        tools/uimg-tool/uimg -u -n part ./var/firmware-update.uimg
 
 2.  Connect to the ftp client and query the current active partition (unless you already know it):
 
@@ -302,9 +302,9 @@ Steps:
 
 1.  Unpack the boot image  
 
-        make -C src/uimg
+        make -C tools/uimg-tool/uimg
         tar xf FRITZ.Box_6591_Cable-07.19-80492-Labor.image ./var/firmware-update.uimg
-        src/uimg/uimg -u -n part ./var/firmware-update.uimg
+        tools/uimg-tool/uimg -u -n part ./var/firmware-update.uimg
 
 2.  Mount the boot partition  
 
@@ -325,7 +325,7 @@ Steps:
 
 4.  Repack the image  
 
-        src/uimg/uimg -p -n part out.img
+        tools/uimg-tool/uimg -p -n part out.img
 
 5.  Program the image  
     You can either program the whole out.img from the shell, or only update 

packages/external/git-nfs

@@ -0,0 +1 @@
+https://github.com/sahlberg/fuse-nfs

packages/external/sha-nfs

@@ -1 +1,2 @@
-9e3d37f7ba910438bc60b53c330f5562ab3d9de63db03d67d13b3fbe7108e2c3  ../dl/master.tar.gz
+3b59c403900605c6bb38588aa4752b4c2919985fe6310ecea5ee472d3f1cdc2a  ../dl/8d59a87.tar.gz
+

puma7/soc.mk

@@ -1,12 +1,19 @@
-src/uimg/uimg:
-	@make -C src/uimg
+UIMG_DIR = $(REPODIR)/tools/uimg-tool
+UIMG     = $(UIMG_DIR)/uimg
+
+$(UIMG_DIR)/Makefile:
+	@git submodule init $(UIMG_DIR)
+	@git submodule update $(UIMG_DIR)
+
+$(UIMG):	$(UIMG_DIR)/Makefile
+	@make -C $(UIMG_DIR)
 
 # extrace uimg
 #
-$(PLAT_TMP)/uimage:	$(ORIG) src/uimg/uimg
+$(PLAT_TMP)/uimage:	$(ORIG) $(UIMG)
 	@mkdir -p $(PLAT_TMP)/uimage
 	@cd $(PLAT_TMP)/uimage; tar xf $(ORIG)
-	@cd $(PLAT_TMP)/uimage; $(REPODIR)/src/uimg/uimg -u -n part var/firmware-update.uimg
+	@cd $(PLAT_TMP)/uimage; $(UIMG) -u -n part var/firmware-update.uimg
 
 # re-pack uimg
 #
@@ -28,7 +35,7 @@ ifeq ($(ENABLE_CONSOLE),1)
 	@rm -f .startup.nsh
 endif
 	@echo "PACK   firmware-update.uimg"
-	@$(REPODIR)/src/uimg/uimg -p -n $(PLAT_TMP)/uimage/part $(PLAT_TMP)/var/firmware-update.uimg
+	@$(UIMG) -p -n $(PLAT_TMP)/uimage/part $(PLAT_TMP)/var/firmware-update.uimg
 	@echo "PACK   $(PLAT_TMP)/$(FWFILE)"
 	@cd $(PLAT_TMP); $(TAR) cf $(RELDIR)/$(FWFILE) var
 	@echo