Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Build ubsec(4) as a module on all arches where it was obivou...
details: https://anonhg.NetBSD.org/src/rev/734bcf947e66
branches: trunk
changeset: 331360:734bcf947e66
user: bad <bad%NetBSD.org@localhost>
date: Sat Aug 09 12:34:05 2014 +0000
description:
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.
diffstat:
distrib/sets/lists/modules/ad.arm | 4 +++-
distrib/sets/lists/modules/ad.mips | 4 +++-
distrib/sets/lists/modules/md.alpha | 4 +++-
distrib/sets/lists/modules/md.amd64 | 4 +++-
distrib/sets/lists/modules/md.hppa | 4 +++-
distrib/sets/lists/modules/md.i386 | 4 +++-
distrib/sets/lists/modules/md.ia64 | 4 +++-
distrib/sets/lists/modules/md.sparc | 4 +++-
distrib/sets/lists/modules/md.sparc64 | 4 +++-
sys/modules/Makefile | 15 +++++++++++++--
10 files changed, 40 insertions(+), 11 deletions(-)
diffs (151 lines):
diff -r b01860cbbc65 -r 734bcf947e66 distrib/sets/lists/modules/ad.arm
--- a/distrib/sets/lists/modules/ad.arm Sat Aug 09 11:33:53 2014 +0000
+++ b/distrib/sets/lists/modules/ad.arm Sat Aug 09 12:34:05 2014 +0000
@@ -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
diff -r b01860cbbc65 -r 734bcf947e66 distrib/sets/lists/modules/ad.mips
--- a/distrib/sets/lists/modules/ad.mips Sat Aug 09 11:33:53 2014 +0000
+++ b/distrib/sets/lists/modules/ad.mips Sat Aug 09 12:34:05 2014 +0000
@@ -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
diff -r b01860cbbc65 -r 734bcf947e66 distrib/sets/lists/modules/md.alpha
--- a/distrib/sets/lists/modules/md.alpha Sat Aug 09 11:33:53 2014 +0000
+++ b/distrib/sets/lists/modules/md.alpha Sat Aug 09 12:34:05 2014 +0000
@@ -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
diff -r b01860cbbc65 -r 734bcf947e66 distrib/sets/lists/modules/md.amd64
--- a/distrib/sets/lists/modules/md.amd64 Sat Aug 09 11:33:53 2014 +0000
+++ b/distrib/sets/lists/modules/md.amd64 Sat Aug 09 12:34:05 2014 +0000
@@ -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
diff -r b01860cbbc65 -r 734bcf947e66 distrib/sets/lists/modules/md.hppa
--- a/distrib/sets/lists/modules/md.hppa Sat Aug 09 11:33:53 2014 +0000
+++ b/distrib/sets/lists/modules/md.hppa Sat Aug 09 12:34:05 2014 +0000
@@ -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
diff -r b01860cbbc65 -r 734bcf947e66 distrib/sets/lists/modules/md.i386
--- a/distrib/sets/lists/modules/md.i386 Sat Aug 09 11:33:53 2014 +0000
+++ b/distrib/sets/lists/modules/md.i386 Sat Aug 09 12:34:05 2014 +0000
@@ -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
diff -r b01860cbbc65 -r 734bcf947e66 distrib/sets/lists/modules/md.ia64
--- a/distrib/sets/lists/modules/md.ia64 Sat Aug 09 11:33:53 2014 +0000
+++ b/distrib/sets/lists/modules/md.ia64 Sat Aug 09 12:34:05 2014 +0000
@@ -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
diff -r b01860cbbc65 -r 734bcf947e66 distrib/sets/lists/modules/md.sparc
--- a/distrib/sets/lists/modules/md.sparc Sat Aug 09 11:33:53 2014 +0000
+++ b/distrib/sets/lists/modules/md.sparc Sat Aug 09 12:34:05 2014 +0000
@@ -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
diff -r b01860cbbc65 -r 734bcf947e66 distrib/sets/lists/modules/md.sparc64
--- a/distrib/sets/lists/modules/md.sparc64 Sat Aug 09 11:33:53 2014 +0000
+++ b/distrib/sets/lists/modules/md.sparc64 Sat Aug 09 12:34:05 2014 +0000
@@ -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
diff -r b01860cbbc65 -r 734bcf947e66 sys/modules/Makefile
--- a/sys/modules/Makefile Sat Aug 09 11:33:53 2014 +0000
+++ b/sys/modules/Makefile Sat Aug 09 12:34:05 2014 +0000
@@ -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+= 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+= 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" || \
Home |
Main Index |
Thread Index |
Old Index