port-powerpc/43074: etc/MAKEDEV.awk doesn't find majors file for powerpc64 builds

[dennis.c.ferguson%gmail.com@localhost]

>Number:         43074
>Category:       port-powerpc
>Synopsis:       etc/MAKEDEV.awk doesn't find majors file for powerpc64 builds
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    port-powerpc-maintainer
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Mar 29 14:00:00 +0000 2010
>Originator:     Dennis Ferguson
>Release:        very recent 5.99.24
>Organization:
>Environment:
NetBSD acer.hk.akit-ferguson.com 5.99.24 NetBSD 5.99.24 (GENERIC) #0: Sun Mar 
14 17:25:30 HKT 2010  
dennis%acer.hk.akit-ferguson.com@localhost:/usr/obj/sys/arch/amd64/compile/GENERIC
 amd64

>Description:
When a macppc64 build gets to the point of making /dev/MAKEDEV
the script etc/MAKEDEV.awk fails as follows:

#    create  etc/MAKEDEV
MACHINE=macppc MACHINE_ARCH=powerpc64  NETBSDSRCDIR=/usr/NetBSD/src  
/usr/NetBSD/src/obj/tooldir.NetBSD-5.99.24-amd64/bin/nbawk -f 
/usr/NetBSD/src/etc/MAKEDEV.awk /usr/NetBSD/src/etc/MAKEDEV.tmpl  > MAKEDEV
ERROR: can't find majors file 
'/usr/NetBSD/src/sys/arch/macppc/conf/majors.macppc'

*** Failed target:  MAKEDEV

>How-To-Repeat:
Do a:

    MACHINE=macppc64 ./build.sh distribution
>Fix:
32 bit macppc builds get their device configuration
from a slightly out-of-the-ordinary spot.  macppc64
builds need to share the customization in MAKEDEV.awk
as in the following patch:

Index: etc/MAKEDEV.awk
===================================================================
RCS file: /cvsroot/src/etc/MAKEDEV.awk,v
retrieving revision 1.20
diff -u -r1.20 MAKEDEV.awk
--- etc/MAKEDEV.awk     30 Apr 2008 13:10:49 -0000      1.20
+++ etc/MAKEDEV.awk     29 Mar 2010 13:56:59 -0000
@@ -59,7 +59,7 @@
                majors[1] = "arch/arm/conf/majors.arm32";
        else if (machine == "sbmips")
                majors[1] = "arch/evbmips/conf/majors.evbmips";
-       else if ((maarch == "powerpc") && system("test -f '" top "arch/" 
machine "/conf/majors." machine "'") != 0)
+       else if ((maarch == "powerpc" || maarch == "powerpc64") && system("test 
-f '" top "arch/" machine "/conf/majors." machine "'") != 0)
                majors[1] = "arch/powerpc/conf/majors.powerpc";
        else
                majors[1] = "arch/" machine "/conf/majors." machine;