aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Bruno <sbruno@FreeBSD.org>2014-04-08 21:39:51 +0000
committerSean Bruno <sbruno@FreeBSD.org>2014-04-08 21:39:51 +0000
commitb434acb3065efd48498d03ee8c1e2d0c008b2bc8 (patch)
treea56f1cb969aba732d22c125054cfab9f143836e7
parentf7ad1c46258d6231f5f4b9cff450fd700c7c6fc2 (diff)
downloadsrc-b434acb3065efd48498d03ee8c1e2d0c008b2bc8.tar.gz
src-b434acb3065efd48498d03ee8c1e2d0c008b2bc8.zip
Actually, since this is what I thought I was doing, only allow the
binmisc code to be build on amd64/i386 for the kernel. Update NOTES with some indication of what this code is used for. Pointed out by jhb@ ... thanks! Submitted by: jhb@
Notes
Notes: svn path=/head/; revision=264280
-rw-r--r--sys/conf/NOTES3
-rw-r--r--sys/conf/options.amd641
-rw-r--r--sys/conf/options.i3861
-rw-r--r--sys/modules/Makefile3
4 files changed, 7 insertions, 1 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 22a2bb064b01..b8059bbd48d2 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2963,3 +2963,6 @@ options RANDOM_YARROW # Yarrow RNG
##options RANDOM_FORTUNA # Fortuna RNG - not yet implemented
options RANDOM_DEBUG # Debugging messages
options RANDOM_RWFILE # Read and write entropy cache
+
+# Module to enable execution of application via emulators like QEMU
+options IMAGACT_BINMISC
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index f1d4b4a57e48..b23c5cd3f77c 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -21,6 +21,7 @@ COMPAT_FREEBSD32 opt_compat.h
COMPAT_LINUX32 opt_compat.h
#COMPAT_SVR4 opt_dontuse.h
#DEBUG_SVR4 opt_svr4.h
+IMAGACT_BINMISC opt_dontuse.h
LINPROCFS opt_dontuse.h
LINSYSFS opt_dontuse.h
NDISAPI opt_dontuse.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 3638266b13f9..7e64a802976c 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -26,6 +26,7 @@ IBCS2 opt_dontuse.h
COMPAT_LINUX opt_dontuse.h
COMPAT_SVR4 opt_dontuse.h
DEBUG_SVR4 opt_svr4.h
+IMAGACT_BINMISC opt_binmisc.h
LINPROCFS opt_dontuse.h
LINSYSFS opt_dontuse.h
NDISAPI opt_dontuse.h
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index bccf33fa2e11..8ce8e2211f5e 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -148,7 +148,7 @@ SUBDIR= \
if_vlan \
${_igb} \
${_iir} \
- imgact_binmisc \
+ ${_imgact_binmisc} \
${_io} \
${_ipoib} \
${_ipdivert} \
@@ -372,6 +372,7 @@ SUBDIR= \
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
_filemon= filemon
+_imagact_binmisc= imgact_binmisc
_vmware= vmware
.endif