From f9f5065b3996aac4cbd4d40d2e6c66e4b7eb45ef Mon Sep 17 00:00:00 2001 From: bad Date: Sat, 9 Aug 2014 12:34:05 +0000 Subject: [PATCH] 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. --- 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(-) diff --git a/distrib/sets/lists/modules/ad.arm b/distrib/sets/lists/modules/ad.arm index 0795c3fd58d3..c64eb1d6900f 100644 --- a/distrib/sets/lists/modules/ad.arm +++ b/distrib/sets/lists/modules/ad.arm @@ -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 --git a/distrib/sets/lists/modules/ad.mips b/distrib/sets/lists/modules/ad.mips index f243197e9e57..6e1f65d29c3b 100644 --- a/distrib/sets/lists/modules/ad.mips +++ b/distrib/sets/lists/modules/ad.mips @@ -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 --git a/distrib/sets/lists/modules/md.alpha b/distrib/sets/lists/modules/md.alpha index feb9aeeb0eff..be5c3851fb09 100644 --- a/distrib/sets/lists/modules/md.alpha +++ b/distrib/sets/lists/modules/md.alpha @@ -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 --git a/distrib/sets/lists/modules/md.amd64 b/distrib/sets/lists/modules/md.amd64 index 3ce1e43b0428..e675341eccdc 100644 --- a/distrib/sets/lists/modules/md.amd64 +++ b/distrib/sets/lists/modules/md.amd64 @@ -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 --git a/distrib/sets/lists/modules/md.hppa b/distrib/sets/lists/modules/md.hppa index ae338c615c61..2837ad595fb9 100644 --- a/distrib/sets/lists/modules/md.hppa +++ b/distrib/sets/lists/modules/md.hppa @@ -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 --git a/distrib/sets/lists/modules/md.i386 b/distrib/sets/lists/modules/md.i386 index 86fdd380a667..50fa031be8f5 100644 --- a/distrib/sets/lists/modules/md.i386 +++ b/distrib/sets/lists/modules/md.i386 @@ -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 --git a/distrib/sets/lists/modules/md.ia64 b/distrib/sets/lists/modules/md.ia64 index 61b6f4696800..a673c4b962f8 100644 --- a/distrib/sets/lists/modules/md.ia64 +++ b/distrib/sets/lists/modules/md.ia64 @@ -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 --git a/distrib/sets/lists/modules/md.sparc b/distrib/sets/lists/modules/md.sparc index a1d85233474f..e2588ee2a23a 100644 --- a/distrib/sets/lists/modules/md.sparc +++ b/distrib/sets/lists/modules/md.sparc @@ -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 --git a/distrib/sets/lists/modules/md.sparc64 b/distrib/sets/lists/modules/md.sparc64 index fca2e7f49669..41ad46b66694 100644 --- a/distrib/sets/lists/modules/md.sparc64 +++ b/distrib/sets/lists/modules/md.sparc64 @@ -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 --git a/sys/modules/Makefile b/sys/modules/Makefile index 7edcca94d0aa..e9fc33a977ea 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -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 @@ -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" || \