yaifo Makefile,1.22,1.23

Update of /cvsroot/yaifo/yaifo
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2584

Modified Files:
        Makefile
Log Message:
Reorder things
Add sgi
Replace MACHINE_ARCH with MACHINE.

Index: Makefile
===================================================================
RCS file: /cvsroot/yaifo/yaifo/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile 24 Feb 2009 22:18:37 -0000 1.22
+++ Makefile 25 Feb 2009 04:20:12 -0000 1.23
@@ -13,7 +13,7 @@
 CBIN?= instbin
 CRUNCHCONF?= ${CBIN}.conf
 LISTS?= ${.CURDIR}/list
-LISTS+= ${.CURDIR}/${MACHINE_ARCH}/list
+LISTS+= ${.CURDIR}/${MACHINE}/list
 UTILS?= ${SRCDIR}/distrib/miniroot
 MTREE= ${UTILS}/mtree.conf
 FS?= ${XNAME}.fs
@@ -24,63 +24,71 @@
 PID!= echo $$$$
 REALIMAGE!= echo /var/tmp/image.${PID}
 
-NEWFSOPTS= -m 0 -o space -i 4096
-
 STRIP= strip
 OBJCOPY= objcopy -Sg -R .comment
-LABEL= ${.CURDIR}/${MACHINE_ARCH}/label
-RDLABEL= ${.CURDIR}/${MACHINE_ARCH}/rdlabel
-STAND= ${SRCDIR}/sys/arch/${MACHINE_ARCH}/stand
+LABEL= ${.CURDIR}/${MACHINE}/label
+RDLABEL= ${.CURDIR}/${MACHINE}/rdlabel
+STAND= ${SRCDIR}/sys/arch/${MACHINE}/stand
 
-.if ${MACHINE} == "macppc"
- MACHINE_ARCH= ${MACHINE}
-.endif
+NEWFSOPTS= -m 0 -o space -i 4096
+LABELOPTS?= -R ${VND} ${LABEL}
+RDLABELOPTS?= -R ${VND} ${RDLABEL}
 
 # architecture specific variables
-.if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE} == "alpha"
 BOOT= /usr/mdec/boot
-BOOTXX= /usr/mdec/biosboot
-INSTALLBOOT=/usr/mdec/installboot
+BOOTXX= /usr/mdec/bootxx
+INSTALLBOOT= /usr/mdec/installboot
 BOOTOUT= ${MOUNT_POINT}/boot
 INSTALLB= ${INSTALLBOOT} -v ${BOOTOUT} ${BOOTXX} ${VND_CRDEV}
 IMAGESIZE= 8192
 RDSIZE= 8192
-.elif ${MACHINE_ARCH} == "amd64"
+.elif ${MACHINE} == "amd64"
 BOOT= /usr/mdec/boot
 BOOTXX= /usr/mdec/biosboot
-INSTALLBOOT=/usr/mdec/installboot
+INSTALLBOOT= /usr/mdec/installboot
 BOOTOUT= ${MOUNT_POINT}/boot
 INSTALLB= ${INSTALLBOOT} -v ${BOOTOUT} ${BOOTXX} ${VND_CRDEV}
 IMAGESIZE= 8192
 RDSIZE= 8192
-.elif ${MACHINE_ARCH} == "alpha"
+.elif ${MACHINE} == "i386"
 BOOT= /usr/mdec/boot
-BOOTXX= /usr/mdec/bootxx
-INSTALLBOOT=/usr/mdec/installboot
-BOOTOUT= ${MOUNT_POINT}/boot
-INSTALLB= ${INSTALLBOOT} -v ${BOOTOUT} ${BOOTXX} ${VND_CRDEV}
-IMAGESIZE= 8192
-RDSIZE= 8192
-.elif ${MACHINE_ARCH} == "sparc"
-BOOT= /var/tmp/usr/mdec/boot
-BOOTXX= /var/tmp/usr/mdec/bootxx
-INSTALLBOOT=/var/tmp/usr/mdec/installboot
+BOOTXX= /usr/mdec/biosboot
+INSTALLBOOT= /usr/mdec/installboot
 BOOTOUT= ${MOUNT_POINT}/boot
 INSTALLB= ${INSTALLBOOT} -v ${BOOTOUT} ${BOOTXX} ${VND_CRDEV}
 IMAGESIZE= 8192
 RDSIZE= 8192
-.elif ${MACHINE_ARCH} == "macppc"
+.elif ${MACHINE} == "macppc"
 BOOT= /usr/mdec/ofwboot
 BOOTXX= /usr/mdec/boot.mac
-INSTALLBOOT=/usr/mdec/installboot
+INSTALLBOOT= /usr/mdec/installboot
 BOOTOUT= ${MOUNT_POINT}/ofwboot
 INSTALLB= ${INSTALLBOOT} -v ${BOOTXX} ${VND_CRDEV}
 IMAGESIZE= 8192
 RDSIZE= 8192
-.elif ${MACHINE_ARCH} == "sparc64"
+.elif ${MACHINE} == "sgi"
+BOOT= /usr/mdec/boot
+BOOTXX= /usr/mdec/sgivol
+INSTALLBOOT= /usr/mdec/installboot
+BOOTOUT= ${MOUNT_POINT}/ofwboot
+INSTALLB= ${INSTALLBOOT} -v ${BOOTXX} ${VND_CRDEV}
+IMAGESIZE= 8192
+RDSIZE= 8192
+LABELOPTS= -w ${VND} rdroot
+RDLABELOPTS= -w ${VND} rdroot
+.elif ${MACHINE} == "sparc"
+BOOT= /var/tmp/usr/mdec/boot
+BOOTXX= /var/tmp/usr/mdec/bootxx
+INSTALLBOOT= /var/tmp/usr/mdec/installboot
+BOOTOUT= ${MOUNT_POINT}/boot
+INSTALLB= ${INSTALLBOOT} -v ${BOOTOUT} ${BOOTXX} ${VND_CRDEV}
+IMAGESIZE= 8192
+RDSIZE= 8192
+.elif ${MACHINE} == "sparc64"
 BOOT= /usr/mdec/ofwboot
 BOOTXX= /usr/mdec/bootblk
-INSTALLBOOT=/usr/mdec/installboot
+INSTALLBOOT= /usr/mdec/installboot
 BOOTOUT= ${MOUNT_POINT}/ofwboot
 INSTALLB= ${INSTALLBOOT} -v ${BOOTXX} ${VND_CRDEV}
 IMAGESIZE= 8192
@@ -96,7 +104,7 @@
 .endif
 
 all: ${.CURDIR}/authorized_keys arch ${FS}
-.if ${MACHINE_ARCH} == "macppc"
+.if ${MACHINE} == "macppc"
         @cp ${.OBJDIR}/bsd.gz ../${XNAME}.rd
         @echo "successfully created yaifo.rd."
 .else
@@ -106,10 +114,10 @@
 .endif
 
 ${FS}: bsd.gz
-.if ${MACHINE_ARCH} != "macppc"
+.if ${MACHINE} != "macppc"
         dd if=/dev/zero of=${REALIMAGE} count=${IMAGESIZE}
         ${SUDO} vnconfig -v -c ${VND} ${REALIMAGE}
- ${SUDO} disklabel -R ${VND} ${LABEL}
+ ${SUDO} disklabel ${LABELOPTS}
         ${SUDO} newfs ${NEWFSOPTS} ${VND_RDEV}
         ${SUDO} mount ${VND_DEV} ${MOUNT_POINT}
         ${SUDO} cp ${BOOT} ${BOOTOUT}
@@ -137,9 +145,9 @@
 
 bsd:
         mkdir -p ${.OBJDIR}/kernel
- config -b ${.OBJDIR}/kernel -s ${SRCDIR}/sys ${TOP}/${MACHINE_ARCH}/${RAMDISK}
+ config -b ${.OBJDIR}/kernel -s ${SRCDIR}/sys ${TOP}/${MACHINE}/${RAMDISK}
         cd ${.OBJDIR}/kernel && \
- make clean && make depend && COPTS=-Os make
+ make clean && make depend && COPTS=-Os make
         cp ${.OBJDIR}/kernel/bsd bsd
 
 ${IMAGE}: ${CBIN} rd_setup do_files rd_teardown
@@ -147,7 +155,7 @@
 rd_setup: ${CBIN}
         dd if=/dev/zero of=${REALIMAGE} bs=512 count=${RDSIZE}
         ${SUDO} vnconfig -v -c ${VND} ${REALIMAGE}
- ${SUDO} disklabel -R ${VND} ${RDLABEL}
+ ${SUDO} disklabel ${RDLABELOPTS}
         ${SUDO} newfs ${NEWFSOPTS} ${VND_RDEV}
         ${SUDO} fsck ${VND_RDEV}
         ${SUDO} mount ${VND_DEV} ${MOUNT_POINT}
@@ -167,7 +175,7 @@
         -${SUDO} vnconfig -u ${VND}
 
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-.if ${MACHINE_ARCH} == "macppc"
+.if ${MACHINE} == "macppc"
         ${SUDO} crunchgen -E -D ${SRCDIR} -L /usr/lib \
         ${.ALLSRC}
 .else
@@ -205,11 +213,11 @@
 .endif
         ${SUDO} mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
         ${SUDO} env TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} SRCDIR=${SRCDIR} \
- ARCH=${MACHINE_ARCH} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
- sh ${UTILS}/runlist.sh ${LISTS}
+ ARCH=${MACHINE} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+ sh ${UTILS}/runlist.sh ${LISTS}
         ${SUDO} rm ${MOUNT_POINT}/${CBIN}
 
-.if ${MACHINE_ARCH} == "sparc"
+.if ${MACHINE} == "sparc"
 arch:
         cd ${STAND} && env RELOC=0x480000 make && \
         env NOMAN= DESTDIR=/var/tmp make install
@@ -224,7 +232,7 @@
 clean:
         /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}*.cache \
                 ${TOP}/${XNAME}.fs ${TOP}/${XNAME}.rd \
- *.o *.lo *.c
+ *.o *.lo *.c
 
 cleanall cleandir: arch_clean
         cd ${SRCDIR}/distrib/special && make clean
@@ -235,17 +243,18 @@
         ${SUDO} /bin/rm -rf ${TOP}/obj || /bin/rm -rf ${TOP}/obj
         # ${SUDO} /bin/rm -rf ${SRCDIR}/distrib/special/ssh
 .for p in sbin/mount_cd9660 bin/df sbin/mount sbin/mount_ext2fs bin/sync \
- sbin/restore bin/stty bin/ln sbin/disklabel bin/pax sbin/ping \
- bin/cat bin/ls sbin/rtsol sbin/ping6 sbin/fdisk sbin/mount_nfs \
- sbin/mount_msdos sbin/umount sbin/mount_udf sbin/fsck sbin/mknod \
- sys/arch/${MACHINE_ARCH}/stand/installboot sbin/route sbin/reboot \
- sbin/mount_ffs bin/ed bin/cp bin/chmod sbin/fsck_ffs \
- usr.sbin/apmd bin/rm bin/mt bin/mkdir usr.bin/sed bin/ksh \
- bin/sleep bin/mv bin/expr usr.sbin/apm bin/hostname
+ sbin/restore bin/stty bin/ln sbin/disklabel bin/pax sbin/ping \
+ bin/cat bin/ls sbin/rtsol sbin/ping6 sbin/fdisk sbin/mount_nfs \
+ sbin/mount_msdos sbin/umount sbin/mount_udf sbin/fsck \
+ sbin/mknod sys/arch/${MACHINE}/stand/installboot sbin/route \
+ sbin/reboot sbin/mount_ffs bin/ed bin/cp bin/chmod \
+ sbin/fsck_ffs usr.sbin/apmd bin/rm bin/mt bin/mkdir \
+ usr.bin/sed bin/ksh bin/sleep bin/mv bin/expr usr.sbin/apm \
+ bin/hostname
         if [ -d ${SRCDIR}/$p ]; then cd ${SRCDIR}/$p && make clean; fi
 .endfor
 
-.if ${MACHINE_ARCH} == "sparc"
+.if ${MACHINE} == "sparc"
 arch_clean:
         cd ${STAND} && make clean
         rm ${TOP}/${XNAME}.net

--
List Info:      http://erdelynet.com/yaifo-changes-list/
List Archives:  http://erdelynet.com/archive/yaifo-changes-l/
To Unsubscribe: Mail mailto:yaifo-changes+unsubscribe@erdelynet.com