Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from matt-nb5-mips64

Browse Source
This commit is contained in:
matt 2009-12-14 01:11:02 +00:00
parent 2288207161
commit 1819481222
14 changed files with 161 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build.sh
View File

@ -1,5 +1,5 @@
#! /usr/bin/env sh
# $NetBSD: build.sh,v 1.223 2009/12/05 16:29:10 pooka Exp $
# $NetBSD: build.sh,v 1.224 2009/12/14 01:11:02 matt Exp $
#
# Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
# All rights reserved.
@ -341,10 +341,22 @@ getarch()
evbmips|sbmips) # no default MACHINE_ARCH
;;
sgimips64)
makewrappermachine=${MACHINE}
MACHINE=${MACHINE%64}
MACHINE_ARCH=mips64eb
;;
ews4800mips|mipsco|newsmips|sgimips)
MACHINE_ARCH=mipseb
;;
algor64|pmax64)
makewrappermachine=${MACHINE}
MACHINE=${MACHINE%64}
MACHINE_ARCH=mips64el
;;
algor|arc|cobalt|hpcmips|pmax)
MACHINE_ARCH=mipsel
;;
@ -412,6 +424,10 @@ validatearch()
arches="arm armeb"
;;
algor|pmax)
arches="mipsel mips64el"
;;
evbmips|sbmips)
arches="mipseb mipsel mips64eb mips64el"
;;
@ -1336,7 +1352,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
# Generated from: \$NetBSD: build.sh,v 1.223 2009/12/05 16:29:10 pooka Exp $
# Generated from: \$NetBSD: build.sh,v 1.224 2009/12/14 01:11:02 matt Exp $
# with these arguments: ${_args}
#

4
distrib/evbmips/Makefile
View File

@ -1,12 +1,10 @@
# $NetBSD: Makefile,v 1.4 2007/03/07 19:42:02 bouyer Exp $
# $NetBSD: Makefile,v 1.5 2009/12/14 01:12:05 matt Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
SUBDIR= cdroms
.if ${MACHINE_ARCH} == "mipsel"
SUBDIR+= instkernel
.endif
TARGETS+= release
iso_image:

11
distrib/evbmips/instkernel/instkernel/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2006/03/30 15:45:42 shige Exp $
# $NetBSD: Makefile,v 1.2 2009/12/14 01:12:05 matt Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@ -9,9 +9,16 @@ RAMDISK= ${RAMDISKDIR}/ramdisk.fs
.if ${MACHINE_ARCH} == "mipsel"
# Little endian platforms.
MDSETTARGETS= INSTALL_OMSAL400 ${RAMDISK} -
MDSETTARGETS+= INSTALL_MALTA ${RAMDISK} -
.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
MDSETTARGETS= INSTALL_MALTA32 ${RAMDISK} -
MDSETTARGETS+= INSTALL_MALTA64 ${RAMDISK} -
.else
# Big endian platforms.
MDSETTARGETS=
MDSETTARGETS= INSTALL_MALTA ${RAMDISK} -
.endif
MDSET_RELEASEDIR= installation
MDSET_SUFFIXES.-= srec create-srec

4
distrib/evbmips/instkernel/ramdisk/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2009/09/20 23:19:52 abs Exp $
# $NetBSD: Makefile,v 1.8 2009/12/14 01:12:05 matt Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@ -13,7 +13,7 @@ DBG= -Os
CRUNCHBIN= ramdiskbin
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
.if ${MACHINE_ARCH} == "mipsel"
.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mips64el"
IMAGEENDIAN= le
.else
IMAGEENDIAN= be

20
distrib/pmax/instkernel/Makefile
View File

@ -1,27 +1,33 @@
# $NetBSD: Makefile,v 1.37 2009/01/18 12:51:25 he Exp $
# $NetBSD: Makefile,v 1.38 2009/12/14 01:12:06 matt Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.kernobj.mk>
.if ${MACHINE_ARCH} == "mips64el"
SFX= 64
.endif
IMAGE= diskimage
IMAGESIZE= 2200k
LISTS= ${.CURDIR}/list
IMAGESIZE= 2400k
LISTS= ${.CURDIR}/list${SFX}
MTREECONF= ${DISTRIBDIR}/common/mtree.dot
IMAGEENDIAN= le
PRIMARYBOOT= ${DESTDIR}/usr/mdec/bootxx_ffs
IMAGEDEPENDS= netbsd-INSTALL.gz ${DESTDIR}/usr/mdec/boot.pmax ${PRIMARYBOOT}
IMAGEDEPENDS= netbsd-INSTALL${SFX}.gz ${DESTDIR}/usr/mdec/boot.pmax ${PRIMARYBOOT}
IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} ${PRIMARYBOOT}
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
MDSETTARGETS= RAMDISK ${RAMDISK} netbsd-INSTALL
MDSETTARGETS= RAMDISK${SFX} ${RAMDISK} netbsd-INSTALL${SFX}
MDSET_RELEASEDIR= binary/kernel
MDSET_SUFFIXES.netbsd-INSTALL= ecoff create-ecoff
create-ecoff= ${ELF2ECOFF} ${.TARGET:R} ${.TARGET}
.if ${MACHINE_ARCH} == "mipsel"
MDSET_SUFFIXES.netbsd-INSTALL${SFX}= ecoff create-ecoff
create-ecoff= ${ELF2ECOFF} ${.TARGET:R} ${.TARGET}
.endif
IMAGE_RELEASEDIR= installation/diskimage

4
distrib/pmax/instkernel/list64 Normal file
View File

@ -0,0 +1,4 @@
# $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

15
distrib/pmax/miniroot/Makefile.inc
View File

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

60
distrib/pmax/miniroot/list64 Normal file
View File

@ -0,0 +1,60 @@
# $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

6
etc/etc.algor/Makefile.inc
View File

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

9
etc/etc.evbmips/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.11 2007/07/24 10:49:25 pavel Exp $
# $NetBSD: Makefile.inc,v 1.12 2009/12/14 01:12:05 matt Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@ -10,10 +10,15 @@ KERNEL_SUFFIXES= srec
.if ${MACHINE_ARCH} == "mipsel"
KERNEL_SETS= ALCHEMY DBAU1500 DBAU1550 MALTA MTX-1 OMSAL400
BUILD_KERNELS= INSTALL_OMSAL400
BUILD_KERNELS= INSTALL_OMSAL400 INSTALL_MALTA
.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
KERNEL_SETS= MALTA32 MALTA64
BUILD_KERNELS= INSTALL_MALTA32 INSTALL_MALTA64
.else
KERNEL_SETS= ALCHEMY DBAU1500 DBAU1550 MALTA
BUILD_KERNELS= INSTALL_OMSAL400 INSTALL_MALTA
.endif

12
etc/etc.pmax/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.16 2007/07/24 10:49:27 pavel Exp $
# $NetBSD: Makefile.inc,v 1.17 2009/12/14 01:12:05 matt Exp $
#
# etc.pmax/Makefile.inc -- pmax-specific etc Makefile targets
#
@ -6,10 +6,20 @@
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
.if ${MACHINE_ARCH} == "mipsel"
KERNEL_SETS= GENERIC
BUILD_KERNELS= INSTALL RAMDISK
.else
KERNEL_SETS= GENERIC64
BUILD_KERNELS= INSTALL64 RAMDISK64
.endif
INSTALLATION_DIRS+= installation/diskimage \
installation/netboot \
installation/miniroot

4
etc/etc.sbmips/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.3 2007/07/24 10:49:27 pavel Exp $
# $NetBSD: Makefile.inc,v 1.4 2009/12/14 01:12:05 matt Exp $
#
# etc.sbmips/Makefile.inc -- sbmips-specific etc Makefile targets
#
@ -6,4 +6,4 @@
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
KERNEL_SETS= GENERIC
KERNEL_SETS= GENERIC${MACHINE_ARCH:S/mips//:C/e[lb]//}

19
etc/etc.sgimips/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.18 2008/10/19 22:05:20 apb Exp $
# $NetBSD: Makefile.inc,v 1.19 2009/12/14 01:12:05 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}

6
lib/libpam/libpam/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.8 2008/10/26 07:44:12 mrg Exp $
# $NetBSD: Makefile,v 1.9 2009/12/14 01:18:20 matt Exp $
#-
# Copyright (c) 1998 Juniper Networks, Inc.
# All rights reserved.
@ -184,8 +184,8 @@ STATIC_MODULE_LIBS:= ${STATIC_MODULE_LIBS} ${MODOBJDIR}/lib${MOD}.a
# XXX Using ${.ALLSRC} in the ld command causes openpam_static.c to be
# XXX used. Why??!! --thorpej
openpam_static_modules.o: openpam_static.o ${STATIC_MODULE_LIBS}
${LD} -o ${.TARGET} -r --whole-archive openpam_static.o \
${STATIC_MODULE_LIBS}
${CC} ${LDFLAGS} -nostdlib -o ${.TARGET} -r -Wl,--whole-archive \
openpam_static.o ${STATIC_MODULE_LIBS}
.include <bsd.lib.mk>
.PATH.h: ${DIST}/include