diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-12-01 22:22:06 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-12-01 22:29:56 +0100 |
| commit | 8852f08eeda3c9ff4c5f9cc90a169338bda1bff9 (patch) | |
| tree | 8b22aaa4e3c283a73fe2af2eccdfa3926a5430ef /package/qemu | |
| parent | 42dd856ca930f79a831361e337d25fb8dd6e0dd1 (diff) | |
| parent | 4f29cc436b24a8007b065253babe27b9346a479e (diff) | |
| download | buildroot-8852f08eeda3c9ff4c5f9cc90a169338bda1bff9.tar.gz buildroot-8852f08eeda3c9ff4c5f9cc90a169338bda1bff9.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qemu')
| -rw-r--r-- | package/qemu/Config.in | 8 | ||||
| -rw-r--r-- | package/qemu/qemu.mk | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 8bae5f40ec..f4a75fc269 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -2,7 +2,8 @@ config BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET bool # Only tested on these architectures default y if BR2_aarch64 || BR2_i386 || BR2_mips || BR2_mipsel \ - || BR2_x86_64 || BR2_arm + || BR2_x86_64 || BR2_arm \ + || BR2_powerpc64 || BR2_powerpc64le comment "QEMU requires a toolchain with wchar, threads" depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET @@ -111,4 +112,9 @@ comment "FDT support needs a toolchain w/ dynamic library" endif # BR2_PACKAGE_QEMU_HAS_EMULS +config BR2_PACKAGE_QEMU_TOOLS + bool "Enable tools" + help + Say 'y' here to include tools packaged with QEMU (e.g. qemu-img). + endif # BR2_PACKAGE_QEMU diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 45fc0fad0a..bc707cf7e6 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -204,6 +204,12 @@ else QEMU_OPTS += --disable-fdt endif +ifeq ($(BR2_PACKAGE_QEMU_TOOLS),y) +QEMU_OPTS += --enable-tools +else +QEMU_OPTS += --disable-tools +endif + # Override CPP, as it expects to be able to call it like it'd # call the compiler. define QEMU_CONFIGURE_CMDS @@ -242,7 +248,6 @@ define QEMU_CONFIGURE_CMDS --disable-strip \ --disable-seccomp \ --disable-sparse \ - --disable-tools \ $(QEMU_OPTS) \ ) endef |
