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

Bas Wijnen wijnen at debian.org
Mon Jul 12 02:55:52 EDT 2010


Hi,

Thanks for the feedback.

I forgot to create fs/ indeed, I do that now in the Makefile, and remove
it entirely in the clean target.  Since it's a generated directory that
way, it doesn't need to be in the repository.

I need to have init.config in fs/, because that directory is the
NanoNote's filesystem when doing a real boot over usb.  Like when
booting over sd, it will need that file to be able to boot.

If you want to do more testing, it's probably convenient to change
Makefile.arch to boot over the udc.  Since you have it compiling anyway,
it saves you filling and replugging the sd card. :-)

Thanks,
Bas

On Mon, Jul 12, 2010 at 11:52:46AM +0800, Xiangfu Liu wrote:
> 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
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.en.qi-hardware.com/pipermail/discussion/attachments/20100712/2a9ef17e/attachment.pgp>


More information about the discussion mailing list


interactive