dslinux/vendors/Nintendo/DSMEM Makefile

stsp stsp at user.in-berlin.de
Tue Aug 15 01:40:35 CEST 2006


Update of /cvsroot/dslinux/dslinux/vendors/Nintendo/DSMEM
In directory antilope:/tmp/cvs-serv2311/DSMEM

Modified Files:
	Makefile 
Log Message:
Don't ignore exit codes of chained commands.


Index: Makefile
===================================================================
RCS file: /cvsroot/dslinux/dslinux/vendors/Nintendo/DSMEM/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	11 Jun 2006 13:45:06 -0000	1.11
+++ Makefile	14 Aug 2006 23:40:33 -0000	1.12
@@ -97,31 +97,31 @@
 	genromfs -v -V "ROMdisk" -f $(ROMFSIMG) -d $(ROMFSDIR)
 	if [ "$(CONFIG_XIP_KERNEL)" != "y" ]; then \
 		BSS=`$(CROSS_COMPILE)objdump --headers $(ROOTDIR)/$(LINUXDIR)/linux | \
-		grep .bss` ; \
-		BSSADDR=`set -- $${BSS} ; echo 0x$${4}` ; \
-		BSSSIZE=`set -- $${BSS} ; echo 0x$${3}` ; \
+		grep .bss` && \
+		BSSADDR=`set -- $${BSS} ; echo 0x$${4}` && \
+		BSSSIZE=`set -- $${BSS} ; echo 0x$${3}` && \
 		ADDR=`echo $${BSSADDR} $${BSSSIZE} | \
-		perl -ane 'printf "0x%x\n",hex($$F[0]) + hex($$F[1])' ` ; \
-		echo "BSS=$${BSSADDR},$${BSSSIZE} ADDR=$${ADDR}" ; \
+		perl -ane 'printf "0x%x\n",hex($$F[0]) + hex($$F[1])' ` && \
+		echo "BSS=$${BSSADDR},$${BSSSIZE} ADDR=$${ADDR}" && \
 		$(CROSS_COMPILE)objcopy --add-section=.romfs=$(ROMFSIMG) \
 		--adjust-section-vma=.romfs=$${ADDR} --no-adjust-warnings \
 		--set-section-flags=.romfs=alloc,load,data   \
-		$(ROOTDIR)/$(LINUXDIR)/linux $(ELFIMAGE) 2> /dev/null ; \
-		$(CROSS_COMPILE)objcopy -O binary $(ELFIMAGE) $(IMAGEDIR)/arm9.bin ; \
+		$(ROOTDIR)/$(LINUXDIR)/linux $(ELFIMAGE) 2> /dev/null && \
+		$(CROSS_COMPILE)objcopy -O binary $(ELFIMAGE) $(IMAGEDIR)/arm9.bin && \
 		ndstool -c $(IMAGEDIR)/dslinux.nds -9 $(IMAGEDIR)/arm9.bin \
 			-r9 0x02000000 -e9 0x02000000  \
 			-7 $(ROOTDIR)/$(LINUXDIR)/arch/arm/mach-nds/arm7.bin \
 		       	-r7 0x03800000 -e7 0x03800000  \
-			-b $(NDS_COMMON)/tux.bmp "DSLinux;Port of Linux;to the DS!" ; \
-		( cd $(IMAGEDIR); tar -cvzf dslinux-dsmem.tgz linux `basename $(IMAGE)` ) \
+			-b $(NDS_COMMON)/tux.bmp "DSLinux;Port of Linux;to the DS!" && \
+		( cd $(IMAGEDIR); tar -cvzf dslinux-dsmem.tgz linux `basename $(IMAGE)` ) ; \
 	else \
 	        $(CROSS_COMPILE)objcopy -O binary \
                         --remove-section=.text --remove-section=.init \
-                        $(ROOTDIR)/$(LINUXDIR)/linux $(IMAGEDIR)/linux.data ; \
+                        $(ROOTDIR)/$(LINUXDIR)/linux $(IMAGEDIR)/linux.data && \
 		$(CROSS_COMPILE)objcopy -O binary \
                         -j .init -j .text \
-                        $(ROOTDIR)/$(LINUXDIR)/linux $(IMAGEDIR)/linux.text ; \
-		cat $(IMAGEDIR)/linux.text $(IMAGEDIR)/linux.data $(ROMFSIMG) > $(IMAGE) ; \
-		( cd $(IMAGEDIR); tar -cvzf dslinux-dsmem.tgz linux `basename $(IMAGE)` ) \
+                        $(ROOTDIR)/$(LINUXDIR)/linux $(IMAGEDIR)/linux.text && \
+		cat $(IMAGEDIR)/linux.text $(IMAGEDIR)/linux.data $(ROMFSIMG) > $(IMAGE) && \
+		( cd $(IMAGEDIR); tar -cvzf dslinux-dsmem.tgz linux `basename $(IMAGE)` ) ; \
 	fi
 




More information about the dslinux-commit mailing list