Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/sets Use the logic in bsd.own.mk to determine machin...



details:   https://anonhg.NetBSD.org/src/rev/30289ac0c9b1
branches:  trunk
changeset: 518089:30289ac0c9b1
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Nov 24 03:08:27 2001 +0000

description:
Use the logic in bsd.own.mk to determine machine/machine_arch.

diffstat:

 distrib/sets/maketars |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (52 lines):

diff -r d002eaab6186 -r 30289ac0c9b1 distrib/sets/maketars
--- a/distrib/sets/maketars     Sat Nov 24 03:06:17 2001 +0000
+++ b/distrib/sets/maketars     Sat Nov 24 03:08:27 2001 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: maketars,v 1.15 2001/01/22 07:03:44 jmc Exp $
+# $NetBSD: maketars,v 1.16 2001/11/24 03:08:27 thorpej Exp $
 #
 # Make release tar files for some or all lists.  Usage:
 # maketars [-b] [-x] [-a arch] [-m machine] [-s setsdir] [-d destdir] \
@@ -9,8 +9,8 @@
 
 # set defaults
 : ${MAKE=make}
-machine=${MACHINE:-`printf 'xxx:\n\techo ${MACHINE}' | $MAKE -s -f-`}
-arch=${MACHINE_ARCH:-`printf 'xxx:\n\techo ${MACHINE_ARCH}' | $MAKE -s -f-`}
+machine=`${MAKE} print_machine`
+machine_arch=`${MAKE} print_machine_arch`
 setd=`pwd`
 nlists="base comp etc games man misc text"
 xlists="xbase xcomp xcontrib xfont xserver xmisc"
@@ -28,7 +28,7 @@
                lists=$xlists
                ;;
        -a*)
-               arch=$2; shift
+               machine_arch=$2; shift
                ;;
        -m*)
                machine=$2; shift
@@ -48,9 +48,9 @@
                [-d dest] [-t tars] [setname ...]
        -b              make netbsd + x11 lists
        -x              only make x11 lists
-       -a arch         set arch (e.g, m68k, mips, powerpc)     [$arch]
-       -m machine      set machine (e.g, amiga, i386, macppc)  [$machine]
-       -s setsdir      directory to find sets  [$setd]
+       -a arch         set arch (e.g, m68k, mipseb, mipsel, powerpc) [$machine_arch]
+       -m machine      set machine (e.g, amiga, i386, macppc) [$machine]
+       -s setsdir      directory to find sets [$setd]
        -d dest         \$DESTDIR       [$dest]
        -t tars         \$RELEASEDIR    [$tars]
        [setname ...]   sets to build   [$lists]
@@ -82,6 +82,6 @@
 for setname in $lists; do
        out=$setname.tgz
        echo "making $out"
-       sh $setd/makeflist -a $arch -m $machine -s $setd $setname > ${dest}/tmp/flist
+       sh $setd/makeflist -a $machine_arch -m $machine -s $setd $setname > ${dest}/tmp/flist
        (cd $dest ; pax -w -d -z < ${dest}/tmp/flist) > ${tars}/$out
 done



Home | Main Index | Thread Index | Old Index