[src/trunk]: src Do not try to build LKMs on evbppc, because we cannot predet...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f7d83f266399
branches:  trunk
changeset: 544271:f7d83f266399
user:      he <he%NetBSD.org@localhost>
date:      Sat Mar 15 22:32:07 2003 +0000

description:
Do not try to build LKMs on evbppc, because we cannot predetermine
the PPC_INTR_IMPL, which is used to include a file in <machine/intr.h>.
To allow evbppc to complete a ``make release'', we also need to
factor out the LKM files to a new set list file, and tweak makeflist
to not include this file for evbppc.

Discussed with Matt Thomas.

diffstat:

 distrib/sets/lists/base/lkm.mi |  19 +++++++++++++++++++
 distrib/sets/lists/base/mi     |  19 +------------------
 distrib/sets/makeflist         |  12 +++++++++++-
 sys/Makefile                   |   8 ++++++--
 4 files changed, 37 insertions(+), 21 deletions(-)

diffs (110 lines):

diff -r 8c26e3a9eec0 -r f7d83f266399 distrib/sets/lists/base/lkm.mi
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/lists/base/lkm.mi    Sat Mar 15 22:32:07 2003 +0000
@@ -0,0 +1,19 @@
+# $NetBSD: lkm.mi,v 1.1 2003/03/15 22:32:08 he Exp $
+./usr/lkm                      base-sys-usr
+./usr/lkm/adosfs.o             base-vfs-lkm
+./usr/lkm/cd9660.o             base-vfs-lkm
+./usr/lkm/coda.o               base-vfs-lkm
+./usr/lkm/ext2fs.o             base-vfs-lkm
+./usr/lkm/fdesc.o              base-vfs-lkm
+./usr/lkm/filecorefs.o         base-vfs-lkm
+./usr/lkm/if_ipl.o             base-ipf-lkm
+./usr/lkm/lfs.o                        base-vfs-lkm
+./usr/lkm/kernfs.o             base-vfs-lkm
+./usr/lkm/mfs.o                        base-vfs-lkm
+./usr/lkm/msdosfs.o            base-vfs-lkm
+./usr/lkm/ntfs.o               base-vfs-lkm
+./usr/lkm/nullfs.o             base-vfs-lkm
+./usr/lkm/overlay.o            base-vfs-lkm
+./usr/lkm/portal.o             base-vfs-lkm
+./usr/lkm/procfs.o             base-vfs-lkm
+./usr/lkm/umapfs.o             base-vfs-lkm
diff -r 8c26e3a9eec0 -r f7d83f266399 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Sat Mar 15 22:30:37 2003 +0000
+++ b/distrib/sets/lists/base/mi        Sat Mar 15 22:32:07 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.389 2003/03/09 13:50:56 he Exp $
+# $NetBSD: mi,v 1.390 2003/03/15 22:32:08 he Exp $
 .                      base-sys-root
 ./altroot              base-sys-root
 ./bin                  base-sys-root
@@ -572,23 +572,6 @@
 ./usr/libexec/uugetty          base-uucp-bin
 ./usr/libexec/virecover                base-util-bin
 ./usr/lkm                      base-sys-usr
-./usr/lkm/adosfs.o             base-vfs-lkm
-./usr/lkm/cd9660.o             base-vfs-lkm
-./usr/lkm/coda.o               base-vfs-lkm
-./usr/lkm/ext2fs.o             base-vfs-lkm
-./usr/lkm/fdesc.o              base-vfs-lkm
-./usr/lkm/filecorefs.o         base-vfs-lkm
-./usr/lkm/if_ipl.o             base-ipf-lkm
-./usr/lkm/lfs.o                        base-vfs-lkm
-./usr/lkm/kernfs.o             base-vfs-lkm
-./usr/lkm/mfs.o                        base-vfs-lkm
-./usr/lkm/msdosfs.o            base-vfs-lkm
-./usr/lkm/ntfs.o               base-vfs-lkm
-./usr/lkm/nullfs.o             base-vfs-lkm
-./usr/lkm/overlay.o            base-vfs-lkm
-./usr/lkm/portal.o             base-vfs-lkm
-./usr/lkm/procfs.o             base-vfs-lkm
-./usr/lkm/umapfs.o             base-vfs-lkm
 ./usr/mdec                     base-sys-usr
 ./usr/sbin                     base-sys-usr
 ./usr/sbin/ac                  base-sysutil-bin
diff -r 8c26e3a9eec0 -r f7d83f266399 distrib/sets/makeflist
--- a/distrib/sets/makeflist    Sat Mar 15 22:30:37 2003 +0000
+++ b/distrib/sets/makeflist    Sat Mar 15 22:32:07 2003 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeflist,v 1.58 2003/01/29 11:32:46 simonb Exp $
+# $NetBSD: makeflist,v 1.59 2003/03/15 22:32:09 he Exp $
 #
 # Print out the files in some or all lists.
 # Usage: makeflist [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...]
@@ -73,6 +73,11 @@
 if [ "$machine_cpu" = "sh3" -o "$machine_arch" = "m68000" ]; then
        shlib=no
 fi
+lkm=yes
+# Turn off LKMs for some ports.
+if [ "$machine" = "evbppc" ]; then
+       lkm=no
+fi
 
 # Turn off lintlibs for some ports.
 # Not needed anymore, leave the hook here for future use.
@@ -128,6 +133,11 @@
                        cat $setd/lists/$setname/shl.${shlib}
                fi
        fi
+       if [ "$lkm" != "no" ]; then
+               if [ -f $setd/lists/$setname/lkm.mi ]; then
+                       cat $setd/lists/$setname/lkm.mi
+               fi
+       fi
        if [ "$lintlibs" != no ]; then
                if [ -f $setd/lists/$setname/lint.mi ]; then
                        cat $setd/lists/$setname/lint.mi
diff -r 8c26e3a9eec0 -r f7d83f266399 sys/Makefile
--- a/sys/Makefile      Sat Mar 15 22:30:37 2003 +0000
+++ b/sys/Makefile      Sat Mar 15 22:32:07 2003 +0000
@@ -1,9 +1,13 @@
-#      $NetBSD: Makefile,v 1.51 2002/12/26 12:31:23 jdolecek Exp $
+#      $NetBSD: Makefile,v 1.52 2003/03/15 22:32:07 he Exp $
 
-SUBDIR=        altq arch compat dev fs lkm miscfs \
+SUBDIR=        altq arch compat dev fs miscfs \
        net netatalk netccitt netinet netinet6 netisdn netiso netkey \
        netnatm netns netsmb nfs sys ufs uvm
 
+.if (${MACHINE} != "evbppc")
+SUBDIR+=lkm
+.endif
+
 # Speedup stubs for some subtrees that don't need to run these rules
 includes-lkm:
        @true