Re: [IPCop-devel] [IPCop-cvs] ipcop/lfs cdrom,1.1.2.50,1.1.2.51

[Ivan K. <ch...@ya...>]

Gilles Espinasse wrote:
> Update of /cvsroot/ipcop/ipcop/lfs
> In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31832/lfs
> 
> Modified Files:
>       Tag: IPCOP_v1_4_0
> 	cdrom 
> Log Message:
> Prefer a Makefile condition than a bash test and every instruction in one line.
> 
> This is superior because Makefile stop on error on the last instruction executed
> So when everything is in one bash line, errors happening are not detected when
> the last command is a success.
> 
> Nothing is changed here but the test and indentation


For those cases when we have to use shell commands we should use '&&' 
instead of ';' .  This should catch all errors.

IvanK.


> 
> 
> Index: cdrom
> ===================================================================
> RCS file: /cvsroot/ipcop/ipcop/lfs/cdrom,v
> retrieving revision 1.1.2.50
> retrieving revision 1.1.2.51
> diff -C2 -d -r1.1.2.50 -r1.1.2.51
> *** cdrom	18 Apr 2008 21:21:41 -0000	1.1.2.50
> --- cdrom	27 Apr 2008 22:56:30 -0000	1.1.2.51
> ***************
> *** 134,161 ****
>   
>   	# make the CDROM iso
> ! 	if [ "$(MACHINE)" == "i386" ]; then \
> ! 		mkdir -p /install/cdrom/boot/isolinux; \
> ! 		dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog; \
> ! 		cp /install/images/cdinitrd.gz              /install/cdrom/boot/isolinux/instroot.gz; \
> ! 		cp /boot/vmlinuz-installer                    /install/cdrom/boot/isolinux/vmlinuz; \
> ! 		cp $(DIR_SRC)/config/kernel/syslinux.cfg    /install/cdrom/boot/isolinux/isolinux.cfg; \
> ! 		cp /usr/lib/syslinux/isolinux.bin           /install/cdrom/boot/isolinux/isolinux.bin; \
> ! 		gunzip -c $(DIR_DL)/memtest86+-1.65.bin.gz > /install/cdrom/boot/isolinux/memtest; \
> ! 		cp $(DIR_SRC)/config/kernel/f*\.txt /install/cdrom/boot/isolinux/; \
> ! 		sed -e 's/boot IPCop/boot IPCop $(VERSION)/' $(DIR_SRC)/config/kernel/f1.txt \
> ! 			> /install/cdrom/boot/isolinux/f1.txt; \
> ! 		cd /install/cdrom && mkisofs -J -r -V "$(NAME)-$(VERSION) $(MACHINE)" -publisher "The IPCop Team" \
>   			-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
>   			-c boot/isolinux/boot.catalog \
> ! 			. > /install/images/$(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso; \
> ! 	elif [ "$(MACHINE)" == "alpha" ]; then \
> ! 		mkdir -p /install/cdrom/etc; \
> ! 		cp /boot/vmlinuz-$(KVER) /install/cdrom/vmlinuz; \
> ! 		cp /install/images/cdinitrd.gz  /install/cdrom/instroot.gz; \
> ! 		cp /boot/bootlx /install/cdrom; \
> ! 		cp $(DIR_SRC)/config/kernel/aboot.conf /install/cdrom/etc/aboot.conf; \
> ! 		cd /install/cdrom && mkisofs -J -r -V "$(NAME)-$(VERSION) $(MACHINE)" -publisher "The IPCop Team" \
> ! 			. > /install/images/$(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso; \
> ! 		isomarkboot /install/images/$(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso bootlx; \
> ! 	fi
>   	rm -rf $$LFS/tmp/*
> --- 134,163 ----
>   
>   	# make the CDROM iso
> ! ifeq "$(MACHINE)" "i386"
> ! 	mkdir -p /install/cdrom/boot/isolinux
> ! 	dd if=/dev/zero  bs=1k count=2		>	/install/cdrom/boot/isolinux/boot.catalog
> ! 	cp /install/images/cdinitrd.gz			/install/cdrom/boot/isolinux/instroot.gz
> ! 	cp /boot/vmlinuz-installer			/install/cdrom/boot/isolinux/vmlinuz
> ! 	cp $(DIR_SRC)/config/kernel/syslinux.cfg	/install/cdrom/boot/isolinux/isolinux.cfg
> ! 	cp /usr/lib/syslinux/isolinux.bin		/install/cdrom/boot/isolinux/isolinux.bin
> ! 	gunzip -c $(DIR_DL)/memtest86+-1.65.bin.gz >	/install/cdrom/boot/isolinux/memtest
> ! 	cp $(DIR_SRC)/config/kernel/f*\.txt		/install/cdrom/boot/isolinux/
> ! 	sed -e 's/boot IPCop/boot IPCop $(VERSION)/' $(DIR_SRC)/config/kernel/f1.txt \
> ! 			> /install/cdrom/boot/isolinux/f1.txt
> ! 	cd /install/cdrom && mkisofs -J -r -V "$(NAME)-$(VERSION) $(MACHINE)" -publisher "The IPCop Team" \
>   			-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
>   			-c boot/isolinux/boot.catalog \
> ! 			. > /install/images/$(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso
> ! endif
> ! ifeq "$(MACHINE)" "alpha"
> ! 	mkdir -p /install/cdrom/etc
> ! 	cp /boot/vmlinuz-$(KVER)			/install/cdrom/vmlinuz
> ! 	cp /install/images/cdinitrd.gz			/install/cdrom/instroot.gz
> ! 	cp /boot/bootlx					/install/cdrom
> ! 	cp $(DIR_SRC)/config/kernel/aboot.conf		/install/cdrom/etc/aboot.conf
> ! 	cd /install/cdrom && mkisofs -J -r -V "$(NAME)-$(VERSION) $(MACHINE)" -publisher "The IPCop Team" \
> ! 			. > /install/images/$(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso
> ! 	isomarkboot /install/images/$(SNAME)-$(VERSION)-install-cd.$(MACHINE).iso bootlx
> ! endif
> ! 
>   	rm -rf $$LFS/tmp/*
> 
> 
> -------------------------------------------------------------------------
> This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
> Don't miss this year's exciting event. There's still time to save $100. 
> Use priority code J8TL2D2. 
> http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
> _______________________________________________
> IPCop-cvs mailing list
> IPC...@li...
> https://lists.sourceforge.net/lists/listinfo/ipcop-cvs