Revision: 7557
          http://sourceforge.net/p/ipcop/svn/7557
Author:   owes
Date:     2014-05-21 16:48:48 +0000 (Wed, 21 May 2014)
Log Message:
-----------
Add ldlinux.c32,libcom32.c32,libutil.c32 to ISO. Sometimes install works 
without, sometimes required.

Modified Paths:
--------------
    ipcop/trunk/lfs/ipcop-boot-cd

Modified: ipcop/trunk/lfs/ipcop-boot-cd
===================================================================
--- ipcop/trunk/lfs/ipcop-boot-cd       2014-05-21 16:47:17 UTC (rev 7556)
+++ ipcop/trunk/lfs/ipcop-boot-cd       2014-05-21 16:48:48 UTC (rev 7557)
@@ -190,38 +190,43 @@
 # make the ISO
 
 ifeq "$(MACHINE)" "i486"
-       mkdir -p                                                
/$(INSTALLER_DIR)/cdrom/boot/isolinux
-       dd if=/dev/zero  bs=1k count=2 >                        
/$(INSTALLER_DIR)/cdrom/boot/isolinux/boot.catalog
-       cp /$(INSTALLER_DIR)/images/cdinitramfs-$(VERSION).img  
/$(INSTALLER_DIR)/cdrom/boot/isolinux/instroot.img
-       cp /boot/vmlinuz-$(KVER)                                
/$(INSTALLER_DIR)/cdrom/boot/isolinux/vmlinuz
-       cp /boot/memtest                                        
/$(INSTALLER_DIR)/cdrom/boot/isolinux/memtest
+       mkdir -p                            
/$(INSTALLER_DIR)/cdrom/boot/isolinux
+       dd if=/dev/zero  bs=1k count=2 >    
/$(INSTALLER_DIR)/cdrom/boot/isolinux/boot.catalog
+       cp /$(INSTALLER_DIR)/images/cdinitramfs-$(VERSION).img 
/$(INSTALLER_DIR)/cdrom/boot/isolinux/instroot.img
+       cp /boot/vmlinuz-$(KVER)            
/$(INSTALLER_DIR)/cdrom/boot/isolinux/vmlinuz
+       cp /boot/memtest                    
/$(INSTALLER_DIR)/cdrom/boot/isolinux/memtest
        # IPAPPEND exist on PXELINUX only
        sed -e '/IPAPPEND/d' \
                -e "s|LOCALBOOTTYPE|0x80|g" \
-               -e "s|ipcopboot=|ipcopboot=cdrom|g"             
$(DIR_SRC)/config/arch/$(MACHINE)/syslinux.cfg > \
-                                                               
/$(INSTALLER_DIR)/cdrom/boot/isolinux/isolinux.cfg
-       sed -e 's/boot IPCop/boot IPCop $(VERSION)/'            
$(DIR_SRC)/config/arch/$(MACHINE)/install-message > \
-                                                               
/$(INSTALLER_DIR)/cdrom/boot/isolinux/message
-       sed -e 's/boot IPCop/boot IPCop $(VERSION)/'            
$(DIR_SRC)/config/arch/$(MACHINE)/f1.txt > \
-                                                               
/$(INSTALLER_DIR)/cdrom/boot/isolinux/f1.txt
-       sed -e 's/boot IPCop/boot IPCop $(VERSION)/'            
$(DIR_SRC)/config/arch/$(MACHINE)/f2.txt > \
-                                                               
/$(INSTALLER_DIR)/cdrom/boot/isolinux/f2.txt
-       sed -e 's/boot IPCop/boot IPCop $(VERSION)/'            
$(DIR_SRC)/config/arch/$(MACHINE)/f3.txt > \
-                                                               
/$(INSTALLER_DIR)/cdrom/boot/isolinux/f3.txt
-       cp /usr/share/syslinux/isolinux.bin                     
/$(INSTALLER_DIR)/cdrom/boot/isolinux/isolinux.bin
-       cp $(DIR_SRC)/config/arch/$(MACHINE)/splash.rle         
/$(INSTALLER_DIR)/cdrom/boot/isolinux/splash.rle
+               -e "s|ipcopboot=|ipcopboot=cdrom|g" \
+                       $(DIR_SRC)/config/arch/$(MACHINE)/syslinux.cfg >    
/$(INSTALLER_DIR)/cdrom/boot/isolinux/isolinux.cfg
+       sed -e 's/boot IPCop/boot IPCop $(VERSION)/' \
+                       $(DIR_SRC)/config/arch/$(MACHINE)/install-message > 
/$(INSTALLER_DIR)/cdrom/boot/isolinux/message
+       sed -e 's/boot IPCop/boot IPCop $(VERSION)/' \
+                       $(DIR_SRC)/config/arch/$(MACHINE)/f1.txt >          
/$(INSTALLER_DIR)/cdrom/boot/isolinux/f1.txt
+       sed -e 's/boot IPCop/boot IPCop $(VERSION)/' \
+                       $(DIR_SRC)/config/arch/$(MACHINE)/f2.txt >          
/$(INSTALLER_DIR)/cdrom/boot/isolinux/f2.txt
+       sed -e 's/boot IPCop/boot IPCop $(VERSION)/' \
+                       $(DIR_SRC)/config/arch/$(MACHINE)/f3.txt >          
/$(INSTALLER_DIR)/cdrom/boot/isolinux/f3.txt
 
-       cd /$(INSTALLER_DIR)/cdrom && xorrisofs                 -J \
-                                                               -r \
-                                                               -publisher "The 
IPCop Team" \
-                                                               -V 
"$(NAME)-$(VERSION) ($(MACHINE))" \
-                                                               -o 
/$(INSTALLER_DIR)/images/$(IPCOP_ISO) \
-                                                               -b 
boot/isolinux/isolinux.bin \
-                                                               -no-emul-boot \
-                                                               -boot-load-size 
4 \
-                                                               
-boot-info-table \
-                                                               -c 
boot/isolinux/boot.catalog \
-                                                               .
+       cp /usr/share/syslinux/isolinux.bin             
/$(INSTALLER_DIR)/cdrom/boot/isolinux/isolinux.bin
+       cp /boot/{ldlinux.c32,libcom32.c32,libutil.c32} 
/$(INSTALLER_DIR)/cdrom/boot/isolinux/
+       cp $(DIR_SRC)/config/arch/$(MACHINE)/splash.rle 
/$(INSTALLER_DIR)/cdrom/boot/isolinux/splash.rle
+
+       cd /$(INSTALLER_DIR)/cdrom && xorrisofs \
+               -joliet -rational-rock \
+               -publisher "The IPCop Team" \
+               -volid "$(NAME)-$(VERSION) ($(MACHINE))" \
+               -o /$(INSTALLER_DIR)/images/$(IPCOP_ISO) \
+               -b boot/isolinux/isolinux.bin \
+               -no-emul-boot \
+               -boot-load-size 4 \
+               -boot-info-table \
+               -c boot/isolinux/boot.catalog \
+               .
+
+       # ISOhybrid ?
+       #/usr/bin/isohybrid /$(INSTALLER_DIR)/images/$(IPCOP_ISO)
 endif
 
 ifeq "$(MACHINE)" "alpha"

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

Reply via email to