diff options
| author | sbruno <sbruno@FreeBSD.org> | 2014-05-16 21:56:33 +0000 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2014-05-16 21:56:33 +0000 |
| commit | ebb52114cf1aa84c06d0ab3acef6f36785f31861 (patch) | |
| tree | e352def97b15ed43cab211eaae322dcec681e70f /sys/conf | |
| parent | 81a04e5982f8e2a0559199cee636afbbaae07df1 (diff) | |
| download | FreeBSD-src-ebb52114cf1aa84c06d0ab3acef6f36785f31861.zip FreeBSD-src-ebb52114cf1aa84c06d0ab3acef6f36785f31861.tar.gz | |
MFC r264269, r264282, r264280, r264291, r264276, r264314
Merge sson's binmiscctl and image activator features to stable/10
Submitted by: sson@freebsd.org
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/NOTES | 3 | ||||
| -rw-r--r-- | sys/conf/files.amd64 | 1 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 1 | ||||
| -rw-r--r-- | sys/conf/options.amd64 | 1 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 1 |
5 files changed, 7 insertions, 0 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index cd1df68..8c90656 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2973,3 +2973,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/files.amd64 b/sys/conf/files.amd64 index d1bdcd9..84b6e6b 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -450,6 +450,7 @@ dev/virtio/balloon/virtio_balloon.c optional virtio_balloon dev/virtio/scsi/virtio_scsi.c optional virtio_scsi isa/syscons_isa.c optional sc isa/vga_isa.c optional vga +kern/imgact_binmisc.c optional imagact_binmisc kern/kern_clocksource.c standard kern/link_elf_obj.c standard # diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index eb8697c..acbfe9f 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -533,6 +533,7 @@ isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/kern_clocksource.c standard kern/imgact_aout.c optional compat_aout +kern/imgact_binmisc.c optional imagact_binmisc kern/imgact_gzip.c optional gzip libkern/divdi3.c standard libkern/ffsl.c standard diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index 31d1650..52aef61 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 3638266..7e64a80 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 |
