[IPCop-cvs] ipcop/lfs cdrom,1.1.2.29,1.1.2.30

[Gilles E. <ges...@us...>]

Update of /cvsroot/ipcop/ipcop/lfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27520/lfs

Modified Files:
      Tag: IPCOP_v1_4_0
	cdrom 
Log Message:
Remove tar from update as we revert to the old one

Delay ndiswrapper to next update with 2.4.32 kernel
Kernel need to be patched to update wireless extensions version

Change make.sh so buildtoolchain is only executed:
- on full build without toolchain package
- on toolchain package building
This should allow not to rebuild a package include in the toolchain 
but with a different version.

Fix VERSION not include in cdrom iso and usb iso first boot screen


Index: cdrom
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/cdrom,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -C2 -d -r1.1.2.29 -r1.1.2.30
*** cdrom	18 Jan 2006 18:42:46 -0000	1.1.2.29
--- cdrom	30 Jan 2006 22:54:33 -0000	1.1.2.30
***************
*** 120,125 ****
  		cp /boot/vmlinuz-installer                    /install/cdrom/boot/isolinux/vmlinuz; \
  		cp $(DIR_SRC)/config/kernel/syslinux.cfg    /install/cdrom/boot/isolinux/isolinux.cfg; \
- 		cp $(DIR_SRC)/config/kernel/install-message /install/cdrom/boot/isolinux/message; \
  		cp /usr/lib/syslinux/isolinux.bin           /install/cdrom/boot/isolinux/isolinux.bin; \
  		cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
  			-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
--- 120,127 ----
  		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; \
+ 		sed -e 's/boot IPCop/boot IPCop $(VERSION)/' $(DIR_SRC)/config/kernel/install-message \
+ 			> /install/message; \
+ 		cp /install/message /install/cdrom/boot/isolinux/message; \
  		cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
  			-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
***************
*** 136,140 ****
  		cp /boot/vmlinuz-installer                  /install/mnt/vmlinuz && \
  		cp $(DIR_SRC)/config/kernel/syslinux.cfg    /install/mnt/syslinux.cfg && \
! 		cp $(DIR_SRC)/config/kernel/install-message /install/mnt/message && \
  		umount /install/mnt && echo "and make the isofile a bootable system ready for dd" && \
  		syslinux /install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso && \
--- 138,142 ----
  		cp /boot/vmlinuz-installer                  /install/mnt/vmlinuz && \
  		cp $(DIR_SRC)/config/kernel/syslinux.cfg    /install/mnt/syslinux.cfg && \
! 		cp /install/message /install/mnt/message && \
  		umount /install/mnt && echo "and make the isofile a bootable system ready for dd" && \
  		syslinux /install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso && \