Mon Dec 14 01:12:06 2009 UTC ()
Merge from matt-nb5-mips64


(matt)
diff -r1.4 -r1.5 src/distrib/evbmips/Makefile
diff -r1.1 -r1.2 src/distrib/evbmips/instkernel/instkernel/Makefile
diff -r1.7 -r1.8 src/distrib/evbmips/instkernel/ramdisk/Makefile
diff -r1.37 -r1.38 src/distrib/pmax/instkernel/Makefile
diff -r0 -r1.2 src/distrib/pmax/instkernel/list64
diff -r1.20 -r1.21 src/distrib/pmax/miniroot/Makefile.inc
diff -r0 -r1.2 src/distrib/pmax/miniroot/list64
diff -r1.3 -r1.4 src/etc/etc.algor/Makefile.inc
diff -r1.11 -r1.12 src/etc/etc.evbmips/Makefile.inc
diff -r1.16 -r1.17 src/etc/etc.pmax/Makefile.inc
diff -r1.3 -r1.4 src/etc/etc.sbmips/Makefile.inc
diff -r1.18 -r1.19 src/etc/etc.sgimips/Makefile.inc
cvs diff -r1.4 -r1.5 src/distrib/evbmips/Makefile (expand / switch to unified diff)

--- src/distrib/evbmips/Makefile 2007/03/07 19:42:02 1.4
+++ src/distrib/evbmips/Makefile 2009/12/14 01:12:05 1.5
@@ -1,15 +1,13 @@ @@ -1,15 +1,13 @@
1# $NetBSD: Makefile,v 1.4 2007/03/07 19:42:02 bouyer Exp $ 1# $NetBSD: Makefile,v 1.5 2009/12/14 01:12:05 matt Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" 4.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
5 5
6SUBDIR= cdroms 6SUBDIR= cdroms
7.if ${MACHINE_ARCH} == "mipsel" 
8SUBDIR+= instkernel 7SUBDIR+= instkernel
9.endif 
10TARGETS+= release 8TARGETS+= release
11 9
12iso_image: 10iso_image:
13 ${MAKEDIRTARGET} cdroms iso_image 11 ${MAKEDIRTARGET} cdroms iso_image
14 12
15.include <bsd.subdir.mk> 13.include <bsd.subdir.mk>
cvs diff -r1.1 -r1.2 src/distrib/evbmips/instkernel/instkernel/Makefile (expand / switch to unified diff)

--- src/distrib/evbmips/instkernel/instkernel/Makefile 2006/03/30 15:45:42 1.1
+++ src/distrib/evbmips/instkernel/instkernel/Makefile 2009/12/14 01:12:05 1.2
@@ -1,23 +1,30 @@ @@ -1,23 +1,30 @@
1# $NetBSD: Makefile,v 1.1 2006/03/30 15:45:42 shige Exp $ 1# $NetBSD: Makefile,v 1.2 2009/12/14 01:12:05 matt Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" 4.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
5 5
6RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} 6RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
7RAMDISK= ${RAMDISKDIR}/ramdisk.fs 7RAMDISK= ${RAMDISKDIR}/ramdisk.fs
8 8
9.if ${MACHINE_ARCH} == "mipsel" 9.if ${MACHINE_ARCH} == "mipsel"
10# Little endian platforms. 10# Little endian platforms.
11MDSETTARGETS= INSTALL_OMSAL400 ${RAMDISK} - 11MDSETTARGETS= INSTALL_OMSAL400 ${RAMDISK} -
 12MDSETTARGETS+= INSTALL_MALTA ${RAMDISK} -
 13
 14.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
 15MDSETTARGETS= INSTALL_MALTA32 ${RAMDISK} -
 16MDSETTARGETS+= INSTALL_MALTA64 ${RAMDISK} -
 17
12.else 18.else
13# Big endian platforms. 19# Big endian platforms.
14MDSETTARGETS=  20MDSETTARGETS= INSTALL_MALTA ${RAMDISK} -
 21
15.endif 22.endif
16MDSET_RELEASEDIR= installation 23MDSET_RELEASEDIR= installation
17MDSET_SUFFIXES.-= srec create-srec 24MDSET_SUFFIXES.-= srec create-srec
18 25
19create-srec= ${OBJCOPY} -O srec ${.TARGET:R} ${.TARGET} 26create-srec= ${OBJCOPY} -O srec ${.TARGET:R} ${.TARGET}
20 27
21.include "${DISTRIBDIR}/common/Makefile.mdset" 28.include "${DISTRIBDIR}/common/Makefile.mdset"
22 29
23.include <bsd.prog.mk> 30.include <bsd.prog.mk>
cvs diff -r1.7 -r1.8 src/distrib/evbmips/instkernel/ramdisk/Makefile (expand / switch to unified diff)

--- src/distrib/evbmips/instkernel/ramdisk/Makefile 2009/09/20 23:19:52 1.7
+++ src/distrib/evbmips/instkernel/ramdisk/Makefile 2009/12/14 01:12:05 1.8
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.7 2009/09/20 23:19:52 abs Exp $ 1# $NetBSD: Makefile,v 1.8 2009/12/14 01:12:05 matt Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" 4.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
5 5
6IMAGE= ramdisk.fs 6IMAGE= ramdisk.fs
7IMAGESIZE= 4096k 7IMAGESIZE= 4096k
8MAKEFS_FLAGS= -f 15 8MAKEFS_FLAGS= -f 15
9 9
10WARNS= 1 10WARNS= 1
11DBG= -Os 11DBG= -Os
12 12
13CRUNCHBIN= ramdiskbin 13CRUNCHBIN= ramdiskbin
14LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst 14LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
15MTREECONF= ${DISTRIBDIR}/common/mtree.common 15MTREECONF= ${DISTRIBDIR}/common/mtree.common
16.if ${MACHINE_ARCH} == "mipsel" 16.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mips64el"
17IMAGEENDIAN= le 17IMAGEENDIAN= le
18.else 18.else
19IMAGEENDIAN= be 19IMAGEENDIAN= be
20.endif 20.endif
21MAKEDEVTARGETS= ramdisk 21MAKEDEVTARGETS= ramdisk
22IMAGEDEPENDS= ${CRUNCHBIN} \ 22IMAGEDEPENDS= ${CRUNCHBIN} \
23 dot.profile \ 23 dot.profile \
24 ${DISTRIBDIR}/common/termcap \ 24 ${DISTRIBDIR}/common/termcap \
25 ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ 25 ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
26 ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ 26 ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
27 ${DISTRIBDIR}/common/services 27 ${DISTRIBDIR}/common/services
28 28
29MAKEDEVTARGETS= std md0 wd0 wd1 wd2 wd3 cd0 cd1 sd0 sd1 sd2 sd3 st0 pty0 ttyv0 29MAKEDEVTARGETS= std md0 wd0 wd1 wd2 wd3 cd0 cd1 sd0 sd1 sd2 sd3 st0 pty0 ttyv0
cvs diff -r1.37 -r1.38 src/distrib/pmax/instkernel/Makefile (expand / switch to unified diff)

--- src/distrib/pmax/instkernel/Makefile 2009/01/18 12:51:25 1.37
+++ src/distrib/pmax/instkernel/Makefile 2009/12/14 01:12:06 1.38
@@ -1,31 +1,37 @@ @@ -1,31 +1,37 @@
1# $NetBSD: Makefile,v 1.37 2009/01/18 12:51:25 he Exp $ 1# $NetBSD: Makefile,v 1.38 2009/12/14 01:12:06 matt Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" 4.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
5 5
6.include <bsd.kernobj.mk> 6.include <bsd.kernobj.mk>
7 7
 8.if ${MACHINE_ARCH} == "mips64el"
 9SFX= 64
 10.endif
 11
8IMAGE= diskimage 12IMAGE= diskimage
9IMAGESIZE= 2200k 13IMAGESIZE= 2400k
10LISTS= ${.CURDIR}/list 14LISTS= ${.CURDIR}/list${SFX}
11MTREECONF= ${DISTRIBDIR}/common/mtree.dot 15MTREECONF= ${DISTRIBDIR}/common/mtree.dot
12IMAGEENDIAN= le 16IMAGEENDIAN= le
13PRIMARYBOOT= ${DESTDIR}/usr/mdec/bootxx_ffs 17PRIMARYBOOT= ${DESTDIR}/usr/mdec/bootxx_ffs
14IMAGEDEPENDS= netbsd-INSTALL.gz ${DESTDIR}/usr/mdec/boot.pmax ${PRIMARYBOOT} 18IMAGEDEPENDS= netbsd-INSTALL${SFX}.gz ${DESTDIR}/usr/mdec/boot.pmax ${PRIMARYBOOT}
15IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} ${PRIMARYBOOT} 19IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} ${PRIMARYBOOT}
16 20
17RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} 21RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
18RAMDISK= ${RAMDISKDIR}/ramdisk.fs 22RAMDISK= ${RAMDISKDIR}/ramdisk.fs
19 23
20MDSETTARGETS= RAMDISK ${RAMDISK} netbsd-INSTALL 24MDSETTARGETS= RAMDISK${SFX} ${RAMDISK} netbsd-INSTALL${SFX}
21MDSET_RELEASEDIR= binary/kernel 25MDSET_RELEASEDIR= binary/kernel
22 26
23MDSET_SUFFIXES.netbsd-INSTALL= ecoff create-ecoff 27.if ${MACHINE_ARCH} == "mipsel"
24create-ecoff= ${ELF2ECOFF} ${.TARGET:R} ${.TARGET} 28MDSET_SUFFIXES.netbsd-INSTALL${SFX}= ecoff create-ecoff
 29create-ecoff= ${ELF2ECOFF} ${.TARGET:R} ${.TARGET}
 30.endif
25 31
26IMAGE_RELEASEDIR= installation/diskimage 32IMAGE_RELEASEDIR= installation/diskimage
27 33
28.include "${DISTRIBDIR}/common/Makefile.image" 34.include "${DISTRIBDIR}/common/Makefile.image"
29.include "${DISTRIBDIR}/common/Makefile.mdset" 35.include "${DISTRIBDIR}/common/Makefile.mdset"
30 36
31.include <bsd.prog.mk> 37.include <bsd.prog.mk>
File Added: src/distrib/pmax/instkernel/list64
#	$NetBSD: list64,v 1.2 2009/12/14 01:12:06 matt Exp $

COPY	${DESTDIR}/usr/mdec/boot.pmax	boot.pmax
COPY	${OBJDIR}/netbsd-INSTALL64.gz	netbsd
cvs diff -r1.20 -r1.21 src/distrib/pmax/miniroot/Makefile.inc (expand / switch to unified diff)

--- src/distrib/pmax/miniroot/Makefile.inc 2009/09/20 23:19:55 1.20
+++ src/distrib/pmax/miniroot/Makefile.inc 2009/12/14 01:12:06 1.21
@@ -1,17 +1,26 @@ @@ -1,17 +1,26 @@
1# $NetBSD: Makefile.inc,v 1.20 2009/09/20 23:19:55 abs Exp $ 1# $NetBSD: Makefile.inc,v 1.21 2009/12/14 01:12:06 matt Exp $
 2
 3.if ${MACHINE_ARCH} == "mips64el"
 4SFX= 64
 5.endif
2 6
3DBG= -Os 7DBG= -Os
4 8
5IMAGESIZE= 32m 9IMAGESIZE= 32m
6MAKEFS_FLAGS= -f 15 10MAKEFS_FLAGS= -f 15
7IMAGEENDIAN= le 11IMAGEENDIAN= le
8MAKEDEVTARGETS= all 12MAKEDEVTARGETS= all
 13LISTS= ${.CURDIR}/list ${ARCHDIR}/list${SFX}
9LISTS+= ${DISTRIBDIR}/common/list.sysinst 14LISTS+= ${DISTRIBDIR}/common/list.sysinst
10MTREECONF+= ${.CURDIR}/mtree.usr.install 15MTREECONF+= ${.CURDIR}/mtree.usr.install
11IMAGEDEPENDS+= ${ARCHDIR}/dot.profile ${DISTRIBDIR}/common/termcap \ 16IMAGEDEPENDS+= ${ARCHDIR}/dot.profile ${DISTRIBDIR}/common/termcap \
12 ${DESTDIR}/.profile ${DESTDIR}/boot.pmax \ 17 ${DESTDIR}/.profile ${DESTDIR}/boot.pmax \
13 ${KERNOBJDIR}/GENERIC/netbsd \ 18 ${DESTDIR}/etc/disktab \
14 ${KERNOBJDIR}/GENERIC/netbsd.ecoff \ 19 ${KERNOBJDIR}/GENERIC${SFX}/netbsd
 20
 21.if ${MACHINE_ARCH} == "mipsel"
 22IMAGEDEPENDS+= ${KERNOBJDIR}/GENERIC/netbsd.ecoff \
15 ${KERNOBJDIR}/INSTALL/nfsnetbsd.ecoff 23 ${KERNOBJDIR}/INSTALL/nfsnetbsd.ecoff
 24.endif
16 25
17IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} ${DESTDIR}/usr/mdec/bootxx_ffs 26IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} ${DESTDIR}/usr/mdec/bootxx_ffs
File Added: src/distrib/pmax/miniroot/list64
#	$NetBSD: list64,v 1.2 2009/12/14 01:12:06 matt Exp $

# extras in bin
PROG	bin/csh
PROG	bin/date
PROG	bin/rcp
PROG	bin/rcmd

# extras in sbin
PROG	sbin/disklabel
PROG	sbin/fsck_ext2fs
PROG	sbin/mount_ext2fs
PROG	sbin/mount_kernfs

# extras in usr/bin
PROG	usr/bin/netstat
PROG	usr/bin/rsh
PROG	usr/bin/tset usr/bin/reset
PROG	usr/bin/vi

# extras in usr/sbin
PROG	usr/sbin/installboot

# crunchgen source directory specials: progs built in nonstandard places
SPECIAL	vi	srcdir usr.bin/nvi/build

# Minimize use of MFS
SYMLINK	/tmp	var/tmp

# we need the contents of /usr/mdec
COPYDIR	${DESTDIR}/usr/mdec	usr/mdec
# and /boot.pmax
COPY	${DESTDIR}/boot.pmax	boot.pmax

# the zoneinfo (dont use)
#COPYDIR	${DESTDIR}/usr/share/zoneinfo	usr/share/zoneinfo

# a subset termcap file
COPY	${ARCHDIR}/termcap.vt100 usr/share/misc/termcap

# copy the kernel(s)
COPY	${KERNOBJDIR}/GENERIC64/netbsd		netbsd
#COPY	${KERNOBJDIR}/GENERIC64/netbsd.ecoff	netbsd.ecoff
#COPY	${KERNOBJDIR}/INSTALL64/nfsnetbsd.ecoff	nfsnetbsd.ecoff

# various files that we need in /etc for the install
#COPY	${DESTDIR}/etc/disktab		etc/disktab.shadow
#SYMLINK	/tmp/disktab.shadow		etc/disktab
#SYMLINK	/tmp/fstab.shadow		etc/fstab
#SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
#SYMLINK	/tmp/hosts			etc/hosts

# sysinst needs disktab template
COPY	${DESTDIR}/etc/disktab		etc/disktab.preinstall

# and the installation tools
COPY	${ARCHDIR}/dot.profile		.profile

# and a spare .profile
COPY	${DESTDIR}/.profile		tmp/.hdprofile
cvs diff -r1.3 -r1.4 src/etc/etc.algor/Makefile.inc (expand / switch to unified diff)

--- src/etc/etc.algor/Makefile.inc 2007/07/24 10:49:23 1.3
+++ src/etc/etc.algor/Makefile.inc 2009/12/14 01:12:05 1.4
@@ -1,9 +1,13 @@ @@ -1,9 +1,13 @@
1# $NetBSD: Makefile.inc,v 1.3 2007/07/24 10:49:23 pavel Exp $ 1# $NetBSD: Makefile.inc,v 1.4 2009/12/14 01:12:05 matt Exp $
2# 2#
3# etc.algor/Makefile.inc -- algor-specific etc Makefile targets 3# etc.algor/Makefile.inc -- algor-specific etc Makefile targets
4# 4#
5 5
6# If you change the list of distributed kernels, don't forget 6# If you change the list of distributed kernels, don't forget
7# to update the release documentation in distrib/notes/common/contents 7# to update the release documentation in distrib/notes/common/contents
8 8
 9.if ${MACHINE_ARCH} == "mipsel"
9KERNEL_SETS= P4032 P5064 10KERNEL_SETS= P4032 P5064
 11.else
 12KERNEL_SETS= P5064-64
 13.endif
cvs diff -r1.11 -r1.12 src/etc/etc.evbmips/Makefile.inc (expand / switch to unified diff)

--- src/etc/etc.evbmips/Makefile.inc 2007/07/24 10:49:25 1.11
+++ src/etc/etc.evbmips/Makefile.inc 2009/12/14 01:12:05 1.12
@@ -1,19 +1,24 @@ @@ -1,19 +1,24 @@
1# $NetBSD: Makefile.inc,v 1.11 2007/07/24 10:49:25 pavel Exp $ 1# $NetBSD: Makefile.inc,v 1.12 2009/12/14 01:12:05 matt Exp $
2# 2#
3# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets 3# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
4# 4#
5 5
6# If you change the list of distributed kernels, don't forget 6# If you change the list of distributed kernels, don't forget
7# to update the release documentation in distrib/notes/common/contents 7# to update the release documentation in distrib/notes/common/contents
8 8
9KERNEL_SUFFIXES= srec 9KERNEL_SUFFIXES= srec
10 10
11.if ${MACHINE_ARCH} == "mipsel" 11.if ${MACHINE_ARCH} == "mipsel"
12KERNEL_SETS= ALCHEMY DBAU1500 DBAU1550 MALTA MTX-1 OMSAL400 12KERNEL_SETS= ALCHEMY DBAU1500 DBAU1550 MALTA MTX-1 OMSAL400
13BUILD_KERNELS= INSTALL_OMSAL400 13BUILD_KERNELS= INSTALL_OMSAL400 INSTALL_MALTA
 14
 15.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
 16KERNEL_SETS= MALTA32 MALTA64
 17BUILD_KERNELS= INSTALL_MALTA32 INSTALL_MALTA64
14 18
15.else 19.else
16KERNEL_SETS= ALCHEMY DBAU1500 DBAU1550 MALTA 20KERNEL_SETS= ALCHEMY DBAU1500 DBAU1550 MALTA
 21BUILD_KERNELS= INSTALL_OMSAL400 INSTALL_MALTA
17 22
18.endif 23.endif
19 24
cvs diff -r1.16 -r1.17 src/etc/etc.pmax/Makefile.inc (expand / switch to unified diff)

--- src/etc/etc.pmax/Makefile.inc 2007/07/24 10:49:27 1.16
+++ src/etc/etc.pmax/Makefile.inc 2009/12/14 01:12:05 1.17
@@ -1,15 +1,25 @@ @@ -1,15 +1,25 @@
1# $NetBSD: Makefile.inc,v 1.16 2007/07/24 10:49:27 pavel Exp $ 1# $NetBSD: Makefile.inc,v 1.17 2009/12/14 01:12:05 matt Exp $
2# 2#
3# etc.pmax/Makefile.inc -- pmax-specific etc Makefile targets 3# etc.pmax/Makefile.inc -- pmax-specific etc Makefile targets
4# 4#
5 5
6# If you change the list of distributed kernels, don't forget 6# If you change the list of distributed kernels, don't forget
7# to update the release documentation in distrib/notes/common/contents 7# to update the release documentation in distrib/notes/common/contents
8 8
 9.if ${MACHINE_ARCH} == "mipsel"
 10
9KERNEL_SETS= GENERIC 11KERNEL_SETS= GENERIC
10 12
11BUILD_KERNELS= INSTALL RAMDISK 13BUILD_KERNELS= INSTALL RAMDISK
12 14
 15.else
 16
 17KERNEL_SETS= GENERIC64
 18
 19BUILD_KERNELS= INSTALL64 RAMDISK64
 20
 21.endif
 22
13INSTALLATION_DIRS+= installation/diskimage \ 23INSTALLATION_DIRS+= installation/diskimage \
14 installation/netboot \ 24 installation/netboot \
15 installation/miniroot 25 installation/miniroot
cvs diff -r1.3 -r1.4 src/etc/etc.sbmips/Makefile.inc (expand / switch to unified diff)

--- src/etc/etc.sbmips/Makefile.inc 2007/07/24 10:49:27 1.3
+++ src/etc/etc.sbmips/Makefile.inc 2009/12/14 01:12:05 1.4
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1# $NetBSD: Makefile.inc,v 1.3 2007/07/24 10:49:27 pavel Exp $ 1# $NetBSD: Makefile.inc,v 1.4 2009/12/14 01:12:05 matt Exp $
2# 2#
3# etc.sbmips/Makefile.inc -- sbmips-specific etc Makefile targets 3# etc.sbmips/Makefile.inc -- sbmips-specific etc Makefile targets
4# 4#
5 5
6# If you change the list of distributed kernels, don't forget 6# If you change the list of distributed kernels, don't forget
7# to update the release documentation in distrib/notes/common/contents 7# to update the release documentation in distrib/notes/common/contents
8 8
9KERNEL_SETS= GENERIC 9KERNEL_SETS= GENERIC${MACHINE_ARCH:S/mips//:C/e[lb]//}
cvs diff -r1.18 -r1.19 src/etc/etc.sgimips/Makefile.inc (expand / switch to unified diff)

--- src/etc/etc.sgimips/Makefile.inc 2008/10/19 22:05:20 1.18
+++ src/etc/etc.sgimips/Makefile.inc 2009/12/14 01:12:05 1.19
@@ -1,34 +1,43 @@ @@ -1,34 +1,43 @@
1# $NetBSD: Makefile.inc,v 1.18 2008/10/19 22:05:20 apb Exp $ 1# $NetBSD: Makefile.inc,v 1.19 2009/12/14 01:12:05 matt Exp $
2# 2#
3# etc.sgimips/Makefile.inc -- sgimips-specific etc Makefile targets 3# etc.sgimips/Makefile.inc -- sgimips-specific etc Makefile targets
4# 4#
5 5
6# If you change the list of distributed kernels, don't forget 6# If you change the list of distributed kernels, don't forget
7# to update the release documentation in distrib/notes/common/contents 7# to update the release documentation in distrib/notes/common/contents
8 8
9KERNEL_SETS= GENERIC32_IP12 GENERIC32_IP2x GENERIC32_IP3x 9.if ${MACHINE_ARCH} == "mipseb"
 10SFX=32
 11.else
 12SFX=64
 13.endif
 14
 15KERNEL_SETS= GENERIC${SFX}_IP2x GENERIC${SFX}_IP3x
 16.if ${MACHINE_ARCH} == "mipseb"
 17KERNEL_SETS= GENERIC32_IP12
10KERNEL_SUFFIXES= ecoff 18KERNEL_SUFFIXES= ecoff
 19.endif
11 20
12#EXTRA_KERNELS= NETBOOT 21#EXTRA_KERNELS= NETBOOT
13 22
14BUILD_KERNELS= INSTALL32_IP2x INSTALL32_IP3x 23BUILD_KERNELS= INSTALL${SFX}_IP2x INSTALL${SFX}_IP3x
15 24
16INSTALLATION_DIRS+= installation/netboot \ 25INSTALLATION_DIRS+= installation/netboot \
17 installation/diskimage 26 installation/diskimage
18 27
19iso-image-md-pre: 28iso-image-md-pre:
20 cp ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-INSTALL32_IP2x.gz ${RELEASEDIR}/ip2x 29 cp ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-INSTALL${SFX}_IP2x.gz ${RELEASEDIR}/ip2x
21 cp ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-INSTALL32_IP3x.gz ${RELEASEDIR}/ip3x 30 cp ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-INSTALL${SFX}_IP3x.gz ${RELEASEDIR}/ip3x
22 echo "ip2x/=${RELEASEDIR}/ip2x/" >> ${CDROM.pathlist} 31 echo "ip2x/=${RELEASEDIR}/ip2x/" >> ${CDROM.pathlist}
23 echo "ip3x/=${RELEASEDIR}/ip3x/" >> ${CDROM.pathlist} 32 echo "ip3x/=${RELEASEDIR}/ip3x/" >> ${CDROM.pathlist}
24 33
25SGI.image= ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom/netbsd-sgimips.img 34SGI.image= ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom/netbsd-sgimips.img
26 35
27iso-image-md-post: 36iso-image-md-post:
28 @SEEK=`${TOOL_AWK} '/SGI_BOOT_BLOCK_SIZE_VOLHDR/{print $$3}' \ 37 @SEEK=`${TOOL_AWK} '/SGI_BOOT_BLOCK_SIZE_VOLHDR/{print $$3}' \
29 ${DESTDIR}/usr/include/sys/bootblock.h` ; \ 38 ${DESTDIR}/usr/include/sys/bootblock.h` ; \
30 EST=`ls -l ${CDROM.image} \ 39 EST=`ls -l ${CDROM.image} \
31 | ${TOOL_AWK} '{ s += $$5 } \ 40 | ${TOOL_AWK} '{ s += $$5 } \
32 END { print int(('$${SEEK}'*512+s)/1024/1024/32+1)*32 \ 41 END { print int(('$${SEEK}'*512+s)/1024/1024/32+1)*32 \
33 }'` ; \ 42 }'` ; \
34 echo "Estimated image size: $${EST} MB"; \ 43 echo "Estimated image size: $${EST} MB"; \