[PATCH] fix the init.config path for iris-sd.tar

Xiangfu Liu xiangfu at sharism.cc
Sun Jul 11 23:52:46 EDT 2010


Hi Bas
 fix the init.config path for iris-sd.tar
 add the empty folder "fs" to git.
 add rm fs/* to clean

I am not sure which is good?
 1. "../" to init.config. or 
 2. make a symlinks of "../init.config" 

Signed-off-by: Xiangfu Liu <xiangfu at sharism.cc>
---
 Makefile                    |    2 +-
 mips/nanonote/Makefile.arch |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 fs/.gitignore

diff --git a/Makefile b/Makefile
index feea48a..637d186 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ fs/%: %
 	ln -s ../$< $@
 
 clean:
-	rm -f *.o boot-programs/*.o $(BUILT_SOURCES) $(ARCH_CLEAN_FILES)
+	rm -f *.o boot-programs/*.o fs/* $(BUILT_SOURCES) $(ARCH_CLEAN_FILES)
 
 debug:
 	stty -F $(SERIAL) raw 9600
diff --git a/fs/.gitignore b/fs/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/mips/nanonote/Makefile.arch b/mips/nanonote/Makefile.arch
index 1621f9e..d32e99b 100644
--- a/mips/nanonote/Makefile.arch
+++ b/mips/nanonote/Makefile.arch
@@ -46,7 +46,7 @@ ARCH_CXXFLAGS = -DNUM_THREADS=4
 all: iris-sd.tar
 iris-sd.tar: $(addprefix fs/,$(addsuffix .elf,$(programs))) iris.raw init.config
 	mkimage -a $(load) -e a$(shell /bin/sh -c '$(OBJDUMP) -t iris.elf | grep __start$$ | cut -b2-8') -n Iris -d iris.raw fs/uimage | sed -e 's/:/;/g'
-	cd fs && tar cvf ../$@ uimage init.config $(addsuffix .elf,$(programs)) --dereference
+	cd fs && tar cvf ../$@ uimage ../init.config $(addsuffix .elf,$(programs)) --dereference
 endif
 
 test: iris.raw mips/nanonote/server/usb-server mips/nanonote/sdram-setup.raw $(addsuffix .elf,$(addprefix fs/,$(programs))) fs/init.config
-- 
1.7.0.4





More information about the discussion mailing list


interactive