Wed Sep 19 16:11:53 2018 UTC ()
Don't build the module sets for non-pae-32bit-pv. Noted by John D. Baker
on port-i386@, thanks.


(maxv)
diff -r1.81 -r1.82 src/distrib/sets/lists/modules/md.i386
diff -r1.3 -r1.4 src/sys/modules/arch/archdirs.mk
diff -r1.1 -r0 src/sys/modules/arch/x86/i386-xen/Makefile
diff -r1.1 -r0 src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk
cvs diff -r1.81 -r1.82 src/distrib/sets/lists/modules/md.i386 (expand / switch to unified diff)

--- src/distrib/sets/lists/modules/md.i386 2018/08/28 09:42:10 1.81
+++ src/distrib/sets/lists/modules/md.i386 2018/09/19 16:11:53 1.82
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: md.i386,v 1.81 2018/08/28 09:42:10 martin Exp $ 1# $NetBSD: md.i386,v 1.82 2018/09/19 16:11:53 maxv Exp $
2# 2#
3# NOTE that there are three sets of files here: 3# NOTE that there are two sets of files here: @MODULEDIR@ and i386pae-xen
4# @MODULEDIR@, i386-xen, and i386pae-xen 
5# 4#
6 5
7./@MODULEDIR@/acpiacad base-kernel-modules kmod 6./@MODULEDIR@/acpiacad base-kernel-modules kmod
8./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod 7./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
9./@MODULEDIR@/acpibat base-kernel-modules kmod 8./@MODULEDIR@/acpibat base-kernel-modules kmod
10./@MODULEDIR@/acpibat/acpibat.kmod base-kernel-modules kmod 9./@MODULEDIR@/acpibat/acpibat.kmod base-kernel-modules kmod
11./@MODULEDIR@/acpibut base-kernel-modules kmod 10./@MODULEDIR@/acpibut base-kernel-modules kmod
12./@MODULEDIR@/acpibut/acpibut.kmod base-kernel-modules kmod 11./@MODULEDIR@/acpibut/acpibut.kmod base-kernel-modules kmod
13./@MODULEDIR@/acpicpu base-kernel-modules kmod 12./@MODULEDIR@/acpicpu base-kernel-modules kmod
14./@MODULEDIR@/acpicpu/acpicpu.kmod base-kernel-modules kmod 13./@MODULEDIR@/acpicpu/acpicpu.kmod base-kernel-modules kmod
15./@MODULEDIR@/acpidalb base-kernel-modules kmod 14./@MODULEDIR@/acpidalb base-kernel-modules kmod
16./@MODULEDIR@/acpidalb/acpidalb.kmod base-kernel-modules kmod 15./@MODULEDIR@/acpidalb/acpidalb.kmod base-kernel-modules kmod
17./@MODULEDIR@/acpifan base-kernel-modules kmod 16./@MODULEDIR@/acpifan base-kernel-modules kmod
cvs diff -r1.3 -r1.4 src/sys/modules/arch/archdirs.mk (expand / switch to unified diff)

--- src/sys/modules/arch/archdirs.mk 2015/06/22 06:46:27 1.3
+++ src/sys/modules/arch/archdirs.mk 2018/09/19 16:11:53 1.4
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: archdirs.mk,v 1.3 2015/06/22 06:46:27 matt Exp $ 1# $NetBSD: archdirs.mk,v 1.4 2018/09/19 16:11:53 maxv Exp $
2 2
3# list of subdirs used per-platform 3# list of subdirs used per-platform
4 4
5.if ${MACHINE} == "amd64" 5.if ${MACHINE} == "amd64"
6ARCHDIR_SUBDIR= x86/amd64-xen 6ARCHDIR_SUBDIR= x86/amd64-xen
7.endif 7.endif
8 8
9.if ${MACHINE} == "i386" 9.if ${MACHINE} == "i386"
10ARCHDIR_SUBDIR= x86/i386-xen x86/i386pae-xen 10ARCHDIR_SUBDIR= x86/i386pae-xen
11.endif 11.endif
12 12
13.if ${MACHINE_ARCH} == "powerpc" 13.if ${MACHINE_ARCH} == "powerpc"
14ARCHDIR_SUBDIR= powerpc/powerpc-4xx powerpc/powerpc-booke 14ARCHDIR_SUBDIR= powerpc/powerpc-4xx powerpc/powerpc-booke
15.endif 15.endif
16 16
17.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" 17.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
18ARCHDIR_SUBDIR= mips/mips-n32 18ARCHDIR_SUBDIR= mips/mips-n32
19.endif 19.endif
File Deleted: src/sys/modules/arch/x86/i386-xen/Attic/Makefile
File Deleted: src/sys/modules/arch/x86/i386-xen/Attic/bsd.i386-xen.mk