summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2016-01-26 07:22:22 +0000
committerimp <imp@FreeBSD.org>2016-01-26 07:22:22 +0000
commit3715af248f8b9c60933bd1211bc486f4cfe90867 (patch)
treeb3da8cb515b09d4038672e183a351a022edf3105 /tools
parent39395f27d6ad4624197fabe0347aab840134e727 (diff)
downloadFreeBSD-src-3715af248f8b9c60933bd1211bc486f4cfe90867.zip
FreeBSD-src-3715af248f8b9c60933bd1211bc486f4cfe90867.tar.gz
Fix the various qemu configs to be buildable.
Diffstat (limited to 'tools')
-rw-r--r--tools/tools/nanobsd/embedded/qemu-amd64.cfg4
-rw-r--r--tools/tools/nanobsd/embedded/qemu-i386.cfg4
-rw-r--r--tools/tools/nanobsd/embedded/qemu-mips.cfg4
-rw-r--r--tools/tools/nanobsd/embedded/qemu-mips64.cfg4
-rw-r--r--tools/tools/nanobsd/embedded/qemu-powerpc.cfg4
-rw-r--r--tools/tools/nanobsd/embedded/qemu-powerpc64.cfg4
-rw-r--r--tools/tools/nanobsd/embedded/qemu-sparc64.cfg4
7 files changed, 14 insertions, 14 deletions
diff --git a/tools/tools/nanobsd/embedded/qemu-amd64.cfg b/tools/tools/nanobsd/embedded/qemu-amd64.cfg
index c405f04..f393f1f 100644
--- a/tools/tools/nanobsd/embedded/qemu-amd64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-amd64.cfg
@@ -29,6 +29,6 @@
NANO_ARCH=amd64
NANO_NAME=qemu-amd64
-qemu_env
+. common # Pull in common definitions
-. common # Pull in common definitions, keep last
+qemu_env
diff --git a/tools/tools/nanobsd/embedded/qemu-i386.cfg b/tools/tools/nanobsd/embedded/qemu-i386.cfg
index 642f19a..96ce026 100644
--- a/tools/tools/nanobsd/embedded/qemu-i386.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-i386.cfg
@@ -29,6 +29,6 @@
NANO_ARCH=i386
NANO_NAME=qemu-i386
-qemu_env
+. common # Pull in common definitions
-. common # Pull in common definitions, keep last
+qemu_env
diff --git a/tools/tools/nanobsd/embedded/qemu-mips.cfg b/tools/tools/nanobsd/embedded/qemu-mips.cfg
index 1582fdf..9242b89 100644
--- a/tools/tools/nanobsd/embedded/qemu-mips.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-mips.cfg
@@ -31,6 +31,6 @@ NANO_KERNEL=MALTA
NANO_DRIVE=ada0
NANO_NAME=qemu-mips
-qemu_env
+. common # Pull in common definitions
-. common # Pull in common definitions, keep last
+qemu_env
diff --git a/tools/tools/nanobsd/embedded/qemu-mips64.cfg b/tools/tools/nanobsd/embedded/qemu-mips64.cfg
index a6ad39e..69fff3a 100644
--- a/tools/tools/nanobsd/embedded/qemu-mips64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-mips64.cfg
@@ -31,6 +31,6 @@ NANO_KERNEL=MALTA64
NANO_DRIVE=ada0
NANO_NAME=qemu-mips64
-qemu_env
+. common # Pull in common definitions
-. common # Pull in common definitions, keep last
+qemu_env
diff --git a/tools/tools/nanobsd/embedded/qemu-powerpc.cfg b/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
index ac1efa1..effdd4b 100644
--- a/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
@@ -32,6 +32,6 @@ NANO_KERNEL=GENERIC
NANO_DRIVE=ada0
NANO_NAME=qemu-powerpc
-qemu_env
+. common # Pull in common definitions
-. common # Pull in common definitions, keep last
+qemu_env
diff --git a/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg b/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
index 3789ee8..525afc6 100644
--- a/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
@@ -31,6 +31,6 @@ NANO_KERNEL=GENERIC64
NANO_DRIVE=ada0
NANO_NAME=qemu-powerpc64
-NANO_DISKIMAGE_FORMAT=qcow2
+. common # Pull in common definitions
-. common # Pull in common definitions, keep last
+qemu_env
diff --git a/tools/tools/nanobsd/embedded/qemu-sparc64.cfg b/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
index d497dd4..d5b565d 100644
--- a/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
@@ -31,6 +31,6 @@ NANO_KERNEL=GENERIC
NANO_DRIVE=ada0
NANO_NAME=qemu-sparc64
-qemu_env
+. common # Pull in common definitions
-. common # Pull in common definitions, keep last
+qemu_env
OpenPOWER on IntegriCloud