[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop: [353] ipcop/trunk
From:       chepati () users ! sourceforge ! net
Date:       2007-05-08 0:52:07
Message-ID: E1HlDvz-0004e5-8B () sc8-pr-svn4 ! sourceforge ! net
[Download RAW message or body]

Revision: 353
          http://ipcop.svn.sourceforge.net/ipcop/?rev=353&view=rev
Author:   chepati
Date:     2007-05-07 17:52:07 -0700 (Mon, 07 May 2007)

Log Message:
-----------
Copy the right kernel image for ppc

Modified Paths:
--------------
    ipcop/trunk/config/install/fstab
    ipcop/trunk/config/install/rc
    ipcop/trunk/config/ppc/yaboot-cdinstall.conf
    ipcop/trunk/lfs/amedyn2
    ipcop/trunk/lfs/initrd
    ipcop/trunk/lfs/linux
    ipcop/trunk/src/installer/main.c

Modified: ipcop/trunk/config/install/fstab
===================================================================
--- ipcop/trunk/config/install/fstab	2007-05-08 00:49:59 UTC (rev 352)
+++ ipcop/trunk/config/install/fstab	2007-05-08 00:52:07 UTC (rev 353)
@@ -1,5 +1,3 @@
-/dev/ram0	/	squashfs
-/dev/fd0	/	squashfs
 /proc		/proc	proc
 none		/sys	sysfs
 none		/tmp	tmpfs

Modified: ipcop/trunk/config/install/rc
===================================================================
--- ipcop/trunk/config/install/rc	2007-05-08 00:49:59 UTC (rev 352)
+++ ipcop/trunk/config/install/rc	2007-05-08 00:52:07 UTC (rev 353)
@@ -1,10 +1,5 @@
 #!/bin/ash
 
-echo -ne "Mounting /tmp ... "
-mount -n -t tmpfs tmpfs /tmp -o mode=1777
-cp /etc/fstab.boot /tmp/fstab
-echo "Done"
-
 echo -ne "Mounting /proc ... " 
 mount -n -t proc none /proc
 echo "Done"
@@ -43,10 +38,6 @@
 mount -n -t devpts devpts /dev/pts
 echo "Done"
 
-echo -ne "Mounting /root ... "
-mount -n -t ramfs none /root
-echo "Done"
-
 echo -ne "Starting syslogd ... "
 syslogd -O /dev/tty4
 echo "Done"

Modified: ipcop/trunk/config/ppc/yaboot-cdinstall.conf
===================================================================
--- ipcop/trunk/config/ppc/yaboot-cdinstall.conf	2007-05-08 00:49:59 UTC (rev 352)
+++ ipcop/trunk/config/ppc/yaboot-cdinstall.conf	2007-05-08 00:52:07 UTC (rev 353)
@@ -6,6 +6,6 @@
 image=/boot/vmlinuz
 	label=install
 	initrd=/boot/instroot.img
-	append="root=/dev/ram0 video=ofonly"
+	append="video=ofonly"
 	read-only
 

Modified: ipcop/trunk/lfs/amedyn2
===================================================================
--- ipcop/trunk/lfs/amedyn2	2007-05-08 00:49:59 UTC (rev 352)
+++ ipcop/trunk/lfs/amedyn2	2007-05-08 00:52:07 UTC (rev 353)
@@ -34,7 +34,7 @@
 
 PKG_NAME   = amedyn2
 VER        = 2006-09-28
-HOST_ARCH  = all
+HOST_ARCH  = i486
 OTHER_SRC  = yes
 KERNEL_MOD = yes
 

Modified: ipcop/trunk/lfs/initrd
===================================================================
--- ipcop/trunk/lfs/initrd	2007-05-08 00:49:59 UTC (rev 352)
+++ ipcop/trunk/lfs/initrd	2007-05-08 00:52:07 UTC (rev 353)
@@ -67,8 +67,9 @@
 	# Finish up initrd directory
 	cd $(INSTALLER_DIR)/initrd/etc && rm -f fstab
 	cp -aRf $(DIR_SRC)/config/install/* $(INSTALLER_DIR)/initrd/etc/
-	mv -f $(INSTALLER_DIR)/initrd/etc/fstab $(INSTALLER_DIR)/initrd/etc/fstab.boot
-	cd $(INSTALLER_DIR)/initrd/etc && ln -s /tmp/fstab fstab
+	#mv -f $(INSTALLER_DIR)/initrd/etc/fstab $(INSTALLER_DIR)/initrd/etc/fstab.boot
+	#cd $(INSTALLER_DIR)/initrd/etc && ln -s /tmp/fstab fstab
+	cd $(INSTALLER_DIR)/initrd && mv etc/init .
 	rm -rf $(INSTALLER_DIR)/initrd/etc{,/udev,/udev/rules.d}/.svn
 	rm -rf $(INSTALLER_DIR)/initrd/usr/share/man
 	chmod 755 $(INSTALLER_DIR)/initrd/etc/halt $(INSTALLER_DIR)/initrd/etc/rc
@@ -141,7 +142,8 @@
 	cd $(INSTALLER_DIR)/mnt && lzma d $(INSTALLER_DIR)/images/drivers-$(VERSION).img \
-so | tar xf -  cd $(INSTALLER_DIR)/mnt && lzma d \
$(INSTALLER_DIR)/images/scsidrv-$(VERSION).img -so | tar xf -  touch \
                $(INSTALLER_DIR)/mnt/CDROMBOOT
-	mksquashfs $(INSTALLER_DIR)/mnt $(INSTALLER_DIR)/images/cdinitrd.img
+	#mksquashfs $(INSTALLER_DIR)/mnt $(INSTALLER_DIR)/images/cdinitrd.img
+	cd $(INSTALLER_DIR)/mnt && find . | cpio -o -H newc | gzip -9 > \
$(INSTALLER_DIR)/images/cdinitrd.img  
 	rm -rf $(INSTALLER_DIR)/mnt/*
 

Modified: ipcop/trunk/lfs/linux
===================================================================
--- ipcop/trunk/lfs/linux	2007-05-08 00:49:59 UTC (rev 352)
+++ ipcop/trunk/lfs/linux	2007-05-08 00:52:07 UTC (rev 353)
@@ -181,7 +181,7 @@
 
 ifeq "$(MACHINE)" "ppc"
 	cd $(DIR_APP) && make -j $(PARALLELISM) all
-	cd $(DIR_APP) && cp -f arch/powerpc/boot/zImage /boot/vmlinuz-$(VER)
+	cd $(DIR_APP) && cp -f vmlinux /boot/vmlinuz-$(VER)
 	cd $(DIR_APP) && cp -f arch/powerpc/boot/zImage.coff /boot/vmlinuz.coff
 	cd $(DIR_APP) && cp -f arch/powerpc/boot/zImage.miboot /boot/vmlinuz.miboot
 	cd $(DIR_APP) && cp -f System.map /boot/System.map-$(VER)

Modified: ipcop/trunk/src/installer/main.c
===================================================================
--- ipcop/trunk/src/installer/main.c	2007-05-08 00:49:59 UTC (rev 352)
+++ ipcop/trunk/src/installer/main.c	2007-05-08 00:52:07 UTC (rev 353)
@@ -1112,7 +1112,7 @@
 /*TR*/
     statuswindow(60, 4, TITLE, gettext("TR_MAKING_FILESYSTEMS"));
 
-    if ((handle=fopen("/tmp/fstab", "w")))
+    if ((handle=fopen("/etc/fstab", "w")))
     {
       for (i = 0; i < numpartitions; i++)
       {
@@ -1215,7 +1215,8 @@
     if (!bigdisk)
 	strcat (bigstring, " --nosquashfs");
     strcat (bigstring, " --with=ext3 --with=scsi_mod  --with=sd_mod --with=sr_mod \
                --with=libata");
-    strcat (bigstring, " --with-usb --fstab=" CONFIG_ROOT "/etc/fstab");
+    strcat (bigstring, " --with=ohci-hcd --with=uhci-hcd --with=ehci-hcd \
--with=usbhid"); +    strcat (bigstring, " --fstab=" CONFIG_ROOT "/etc/fstab");
 
     //add each module ...
     for (i = 0; i < nummodules; i++)


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

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic