svn commit: r294775 - head/tools/tools/nanobsd/embedded

[Warner Losh]

Author: imp
Date: Tue Jan 26 07:22:22 2016
New Revision: 294775
URL: https://svnweb.freebsd.org/changeset/base/294775

Log:
  Fix the various qemu configs to be buildable.

Modified:
  head/tools/tools/nanobsd/embedded/qemu-amd64.cfg
  head/tools/tools/nanobsd/embedded/qemu-i386.cfg
  head/tools/tools/nanobsd/embedded/qemu-mips.cfg
  head/tools/tools/nanobsd/embedded/qemu-mips64.cfg
  head/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
  head/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
  head/tools/tools/nanobsd/embedded/qemu-sparc64.cfg

Modified: head/tools/tools/nanobsd/embedded/qemu-amd64.cfg
==============================================================================
--- head/tools/tools/nanobsd/embedded/qemu-amd64.cfg	Tue Jan 26 07:17:21 2016	(r294774)
+++ head/tools/tools/nanobsd/embedded/qemu-amd64.cfg	Tue Jan 26 07:22:22 2016	(r294775)
@@ -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

Modified: head/tools/tools/nanobsd/embedded/qemu-i386.cfg
==============================================================================
--- head/tools/tools/nanobsd/embedded/qemu-i386.cfg	Tue Jan 26 07:17:21 2016	(r294774)
+++ head/tools/tools/nanobsd/embedded/qemu-i386.cfg	Tue Jan 26 07:22:22 2016	(r294775)
@@ -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

Modified: head/tools/tools/nanobsd/embedded/qemu-mips.cfg
==============================================================================
--- head/tools/tools/nanobsd/embedded/qemu-mips.cfg	Tue Jan 26 07:17:21 2016	(r294774)
+++ head/tools/tools/nanobsd/embedded/qemu-mips.cfg	Tue Jan 26 07:22:22 2016	(r294775)
@@ -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

Modified: head/tools/tools/nanobsd/embedded/qemu-mips64.cfg
==============================================================================
--- head/tools/tools/nanobsd/embedded/qemu-mips64.cfg	Tue Jan 26 07:17:21 2016	(r294774)
+++ head/tools/tools/nanobsd/embedded/qemu-mips64.cfg	Tue Jan 26 07:22:22 2016	(r294775)
@@ -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

Modified: head/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
==============================================================================
--- head/tools/tools/nanobsd/embedded/qemu-powerpc.cfg	Tue Jan 26 07:17:21 2016	(r294774)
+++ head/tools/tools/nanobsd/embedded/qemu-powerpc.cfg	Tue Jan 26 07:22:22 2016	(r294775)
@@ -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

Modified: head/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
==============================================================================
--- head/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg	Tue Jan 26 07:17:21 2016	(r294774)
+++ head/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg	Tue Jan 26 07:22:22 2016	(r294775)
@@ -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

Modified: head/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
==============================================================================
--- head/tools/tools/nanobsd/embedded/qemu-sparc64.cfg	Tue Jan 26 07:17:21 2016	(r294774)
+++ head/tools/tools/nanobsd/embedded/qemu-sparc64.cfg	Tue Jan 26 07:22:22 2016	(r294775)
@@ -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