Module Name: src
Committed By: bad
Date: Sat Aug 9 12:34:05 UTC 2014
Modified Files:
src/distrib/sets/lists/modules: ad.arm ad.mips md.alpha md.amd64
md.hppa md.i386 md.ia64 md.sparc md.sparc64
src/sys/modules: Makefile
Log Message:
Build ubsec(4) as a module on all arches where it was obivous how to do so.
That excludes powerpc because evppc OEA is missing definitions for
PPC_INTR_IMPL and PPC_PCI_MACHDEP_IMPL.
Adjust set lists.
Compile tested for most arches only.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/modules/ad.arm \
src/distrib/sets/lists/modules/md.sparc64
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/modules/ad.mips \
src/distrib/sets/lists/modules/md.alpha \
src/distrib/sets/lists/modules/md.hppa \
src/distrib/sets/lists/modules/md.ia64
cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/modules/md.sparc
cvs rdiff -u -r1.136 -r1.137 src/sys/modules/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/ad.arm
diff -u src/distrib/sets/lists/modules/ad.arm:1.2 src/distrib/sets/lists/modules/ad.arm:1.3
--- src/distrib/sets/lists/modules/ad.arm:1.2 Sun Aug 11 22:29:03 2013
+++ src/distrib/sets/lists/modules/ad.arm Sat Aug 9 12:34:05 2014
@@ -1,4 +1,6 @@
-# $NetBSD: ad.arm,v 1.2 2013/08/11 22:29:03 joerg Exp $
+# $NetBSD: ad.arm,v 1.3 2014/08/09 12:34:05 bad Exp $
./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
+./@MODULEDIR@/ubsec base-kernel-modules kmod
+./@MODULEDIR@/ubsec/ubsec.kmod base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.sparc64
diff -u src/distrib/sets/lists/modules/md.sparc64:1.2 src/distrib/sets/lists/modules/md.sparc64:1.3
--- src/distrib/sets/lists/modules/md.sparc64:1.2 Thu Aug 11 12:03:58 2011
+++ src/distrib/sets/lists/modules/md.sparc64 Sat Aug 9 12:34:05 2014
@@ -1,7 +1,9 @@
-# $NetBSD: md.sparc64,v 1.2 2011/08/11 12:03:58 mbalmer Exp $
+# $NetBSD: md.sparc64,v 1.3 2014/08/09 12:34:05 bad Exp $
./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
./@MODULEDIR@/exec_elf64 base-kernel-modules kmod
./@MODULEDIR@/exec_elf64/exec_elf64.kmod base-kernel-modules kmod
./@MODULEDIR@/pwdog base-kernel-modules kmod
./@MODULEDIR@/pwdog/pwdog.kmod base-kernel-modules kmod
+./@MODULEDIR@/ubsec base-kernel-modules kmod
+./@MODULEDIR@/ubsec/ubsec.kmod base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/ad.mips
diff -u src/distrib/sets/lists/modules/ad.mips:1.1 src/distrib/sets/lists/modules/ad.mips:1.2
--- src/distrib/sets/lists/modules/ad.mips:1.1 Tue Apr 30 23:41:24 2013
+++ src/distrib/sets/lists/modules/ad.mips Sat Aug 9 12:34:05 2014
@@ -1,3 +1,5 @@
-# $NetBSD: ad.mips,v 1.1 2013/04/30 23:41:24 matt Exp $
+# $NetBSD: ad.mips,v 1.2 2014/08/09 12:34:05 bad Exp $
./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
+./@MODULEDIR@/ubsec base-kernel-modules kmod
+./@MODULEDIR@/ubsec/ubsec.kmod base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.alpha
diff -u src/distrib/sets/lists/modules/md.alpha:1.1 src/distrib/sets/lists/modules/md.alpha:1.2
--- src/distrib/sets/lists/modules/md.alpha:1.1 Mon Sep 7 02:27:29 2009
+++ src/distrib/sets/lists/modules/md.alpha Sat Aug 9 12:34:05 2014
@@ -1,3 +1,5 @@
-# $NetBSD: md.alpha,v 1.1 2009/09/07 02:27:29 jnemeth Exp $
+# $NetBSD: md.alpha,v 1.2 2014/08/09 12:34:05 bad Exp $
./@MODULEDIR@/exec_elf64 base-kernel-modules kmod
./@MODULEDIR@/exec_elf64/exec_elf64.kmod base-kernel-modules kmod
+./@MODULEDIR@/ubsec base-kernel-modules kmod
+./@MODULEDIR@/ubsec/ubsec.kmod base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.hppa
diff -u src/distrib/sets/lists/modules/md.hppa:1.1 src/distrib/sets/lists/modules/md.hppa:1.2
--- src/distrib/sets/lists/modules/md.hppa:1.1 Mon Feb 24 07:23:39 2014
+++ src/distrib/sets/lists/modules/md.hppa Sat Aug 9 12:34:05 2014
@@ -1,3 +1,5 @@
-# $NetBSD: md.hppa,v 1.1 2014/02/24 07:23:39 skrll Exp $
+# $NetBSD: md.hppa,v 1.2 2014/08/09 12:34:05 bad Exp $
./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
+./@MODULEDIR@/ubsec base-kernel-modules kmod
+./@MODULEDIR@/ubsec/ubsec.kmod base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.ia64
diff -u src/distrib/sets/lists/modules/md.ia64:1.1 src/distrib/sets/lists/modules/md.ia64:1.2
--- src/distrib/sets/lists/modules/md.ia64:1.1 Mon May 31 20:32:28 2010
+++ src/distrib/sets/lists/modules/md.ia64 Sat Aug 9 12:34:05 2014
@@ -1,3 +1,5 @@
-# $NetBSD: md.ia64,v 1.1 2010/05/31 20:32:28 pgoyette Exp $
+# $NetBSD: md.ia64,v 1.2 2014/08/09 12:34:05 bad Exp $
./@MODULEDIR@/acpiverbose base-kernel-modules kmod
./@MODULEDIR@/acpiverbose/acpiverbose.kmod base-kernel-modules kmod
+./@MODULEDIR@/ubsec base-kernel-modules kmod
+./@MODULEDIR@/ubsec/ubsec.kmod base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.38 src/distrib/sets/lists/modules/md.amd64:1.39
--- src/distrib/sets/lists/modules/md.amd64:1.38 Sun Nov 17 18:58:28 2013
+++ src/distrib/sets/lists/modules/md.amd64 Sat Aug 9 12:34:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.38 2013/11/17 18:58:28 alnsn Exp $
+# $NetBSD: md.amd64,v 1.39 2014/08/09 12:34:05 bad Exp $
./@MODULEDIR@/acpiacad base-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibat base-kernel-modules kmod
@@ -119,6 +119,8 @@
./@MODULEDIR@/tprof_pmi/tprof_pmi.kmod base-kernel-modules kmod
./@MODULEDIR@/tvpll base-kernel-modules kmod
./@MODULEDIR@/tvpll/tvpll.kmod base-kernel-modules kmod
+./@MODULEDIR@/ubsec base-kernel-modules kmod
+./@MODULEDIR@/ubsec/ubsec.kmod base-kernel-modules kmod
./@MODULEDIR@/vmt base-kernel-modules kmod
./@MODULEDIR@/vmt/vmt.kmod base-kernel-modules kmod
./@MODULEDIR@/wbsio base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.43 src/distrib/sets/lists/modules/md.i386:1.44
--- src/distrib/sets/lists/modules/md.i386:1.43 Sun Nov 17 18:58:28 2013
+++ src/distrib/sets/lists/modules/md.i386 Sat Aug 9 12:34:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.43 2013/11/17 18:58:28 alnsn Exp $
+# $NetBSD: md.i386,v 1.44 2014/08/09 12:34:05 bad Exp $
./@MODULEDIR@/acpiacad base-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibat base-kernel-modules kmod
@@ -141,6 +141,8 @@
./@MODULEDIR@/tprof_pmi/tprof_pmi.kmod base-kernel-modules kmod
./@MODULEDIR@/tvpll base-kernel-modules kmod
./@MODULEDIR@/tvpll/tvpll.kmod base-kernel-modules kmod
+./@MODULEDIR@/ubsec base-kernel-modules kmod
+./@MODULEDIR@/ubsec/ubsec.kmod base-kernel-modules kmod
./@MODULEDIR@/viac7temp base-kernel-modules kmod
./@MODULEDIR@/viac7temp/viac7temp.kmod base-kernel-modules kmod
./@MODULEDIR@/viadrm base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.sparc
diff -u src/distrib/sets/lists/modules/md.sparc:1.3 src/distrib/sets/lists/modules/md.sparc:1.4
--- src/distrib/sets/lists/modules/md.sparc:1.3 Sun Nov 17 18:58:28 2013
+++ src/distrib/sets/lists/modules/md.sparc Sat Aug 9 12:34:05 2014
@@ -1,7 +1,9 @@
-# $NetBSD: md.sparc,v 1.3 2013/11/17 18:58:28 alnsn Exp $
+# $NetBSD: md.sparc,v 1.4 2014/08/09 12:34:05 bad Exp $
./@MODULEDIR@/bpfjit base-kernel-modules kmod,sljit
./@MODULEDIR@/bpfjit/bpfjit.kmod base-kernel-modules kmod,sljit
./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
./@MODULEDIR@/sljit base-kernel-modules kmod,sljit
./@MODULEDIR@/sljit/sljit.kmod base-kernel-modules kmod,sljit
+./@MODULEDIR@/ubsec base-kernel-modules kmod
+./@MODULEDIR@/ubsec/ubsec.kmod base-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.136 src/sys/modules/Makefile:1.137
--- src/sys/modules/Makefile:1.136 Sun May 18 11:46:23 2014
+++ src/sys/modules/Makefile Sat Aug 9 12:34:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2014/05/18 11:46:23 kardel Exp $
+# $NetBSD: Makefile,v 1.137 2014/08/09 12:34:05 bad Exp $
.include <bsd.own.mk>
@@ -105,7 +105,6 @@ SUBDIR+= zlib
SUBDIR+= tprof
.if (defined(NOTYET))
SUBDIR+= hifn # Builds on architectures with PCI bus
-SUBDIR+= ubsec # Builds on architectures with PCI bus
SUBDIR+= unionfs
.endif
.if ${MKBINUTILS} != "no"
@@ -143,6 +142,18 @@ SUBDIR+= tprof_amdpmi
SUBDIR+= vmt
.endif
+.if ${MACHINE_ARCH} == "alpha" || \
+ !empty(${MACHINE_ARCH:Mearm*}) || !empty(${MACHINE_ARCH:Marm*}) || \
+ ${MACHINE_ARCH} == "i386" || \
+ ${MACHINE_ARCH} == "ia64" || \
+ ${MACHINE_ARCH} == "hppa" || \
+ !empty(${MACHINE_ARCH:Mmips*}) || \
+ ${MACHINE_ARCH} == "sparc" || \
+ ${MACHINE_ARCH} == "sparc64" || \
+ ${MACHINE_ARCH} == "x86_64"
+SUBDIR+= ubsec # Builds on architectures with PCI bus
+.endif
+
.if ${MKSLJIT} != "no"
# No modules for arm, mips and powerpc yet.
.if ${MACHINE_ARCH} == "i386" || \
