Module Name: src
Committed By: matt
Date: Thu Sep 10 03:22:33 UTC 2009
Modified Files:
src/etc/etc.sgimips [matt-nb5-mips64]: Makefile.inc
Added Files:
src/distrib/sgimips/instkernel [matt-nb5-mips64]: list64
Log Message:
More build adjustments for sgimips64.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/distrib/sgimips/instkernel/list64
cvs rdiff -u -r1.18 -r1.18.8.1 src/etc/etc.sgimips/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.sgimips/Makefile.inc
diff -u src/etc/etc.sgimips/Makefile.inc:1.18 src/etc/etc.sgimips/Makefile.inc:1.18.8.1
--- src/etc/etc.sgimips/Makefile.inc:1.18 Sun Oct 19 22:05:20 2008
+++ src/etc/etc.sgimips/Makefile.inc Thu Sep 10 03:22:33 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2008/10/19 22:05:20 apb Exp $
+# $NetBSD: Makefile.inc,v 1.18.8.1 2009/09/10 03:22:33 matt Exp $
#
# etc.sgimips/Makefile.inc -- sgimips-specific etc Makefile targets
#
@@ -6,19 +6,28 @@
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
-KERNEL_SETS= GENERIC32_IP12 GENERIC32_IP2x GENERIC32_IP3x
+.if ${MACHINE_ARCH} == "mipseb"
+SFX=32
+.else
+SFX=64
+.endif
+
+KERNEL_SETS= GENERIC${SFX}_IP2x GENERIC${SFX}_IP3x
+.if ${MACHINE_ARCH} == "mipseb"
+KERNEL_SETS= GENERIC32_IP12
KERNEL_SUFFIXES= ecoff
+.endif
#EXTRA_KERNELS= NETBOOT
-BUILD_KERNELS= INSTALL32_IP2x INSTALL32_IP3x
+BUILD_KERNELS= INSTALL${SFX}_IP2x INSTALL${SFX}_IP3x
INSTALLATION_DIRS+= installation/netboot \
installation/diskimage
iso-image-md-pre:
- cp ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-INSTALL32_IP2x.gz ${RELEASEDIR}/ip2x
- cp ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-INSTALL32_IP3x.gz ${RELEASEDIR}/ip3x
+ cp ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-INSTALL${SFX}_IP2x.gz ${RELEASEDIR}/ip2x
+ cp ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-INSTALL${SFX}_IP3x.gz ${RELEASEDIR}/ip3x
echo "ip2x/=${RELEASEDIR}/ip2x/" >> ${CDROM.pathlist}
echo "ip3x/=${RELEASEDIR}/ip3x/" >> ${CDROM.pathlist}
Added files:
Index: src/distrib/sgimips/instkernel/list64
diff -u /dev/null src/distrib/sgimips/instkernel/list64:1.1.2.1
--- /dev/null Thu Sep 10 03:22:33 2009
+++ src/distrib/sgimips/instkernel/list64 Thu Sep 10 03:22:33 2009
@@ -0,0 +1,4 @@
+# $NetBSD: list64,v 1.1.2.1 2009/09/10 03:22:33 matt Exp $
+
+COPY ${OBJDIR}/netbsd-INSTALL64_IP2x.gz netbsd
+COPY ${OBJDIR}/netbsd-INSTALL64_IP3x.gz netbsd
