* [Buildroot] [PATCH 30/47] package/qemu: add uuid support
From: Yann E. MORIN @ 2012-10-24 21:25 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 9 +++++++++
package/qemu/qemu.mk | 8 +++++++-
2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index 65d1ffd..e114fac 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -117,6 +117,15 @@ config BR2_PACKAGE_QEMU_SDL
comment "Misc. features"
+config BR2_PACKAGE_QEMU_UUID
+ bool "Enable VMs UUID"
+ depends on BR2_PACKAGE_UTIL_LINUX_LIBUUID
+ help
+ Say 'y' here to have QEMU support UUIDs for VMs.
+
+comment "UUID support requires libuuid (from util-linux)"
+ depends on !BR2_PACKAGE_UTIL_LINUX_LIBUUID
+
config BR2_PACKAGE_QEMU_BLOBS
bool "Install binary blobs"
default y
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 8684d66..d899fdb 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -83,6 +83,13 @@ else
QEMU_OPTS += --disable-sdl
endif
+ifeq ($(BR2_PACKAGE_QEMU_UUID),y)
+QEMU_OPTS += --enable-uuid
+QEMU_DEPENDENCIES += util-linux
+else
+QEMU_OPTS += --disable-uuid
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_BLOBS),)
QEMU_OPTS += --disable-blobs
endif
@@ -172,7 +179,6 @@ define QEMU_CONFIGURE_CMDS
--disable-fdt \
--disable-bluez \
--disable-guest-base \
- --disable-uuid \
--disable-vde \
--disable-linux-aio \
--disable-cap-ng \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 31/47] package/qemu: add support for capabilities
From: Yann E. MORIN @ 2012-10-24 21:25 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 7 +++++++
package/qemu/qemu.mk | 11 ++++++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index e114fac..6784d75 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -126,6 +126,13 @@ config BR2_PACKAGE_QEMU_UUID
comment "UUID support requires libuuid (from util-linux)"
depends on !BR2_PACKAGE_UTIL_LINUX_LIBUUID
+config BR2_PACKAGE_QEMU_CAP
+ bool "Enable capabilities"
+ select BR2_PACKAGE_LIBCAP
+ select BR2_PACKAGE_LIBCAP_NG
+ help
+ Say 'y' here if you want QEMU to support capabilities.
+
config BR2_PACKAGE_QEMU_BLOBS
bool "Install binary blobs"
default y
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index d899fdb..56d0c3c 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -90,6 +90,16 @@ else
QEMU_OPTS += --disable-uuid
endif
+# There's no configure flag to disable use of libcap
+# so we must use an environment variable
+ifeq ($(BR2_PACKAGE_QEMU_CAP),y)
+QEMU_OPTS += --enable-cap-ng
+QEMU_DEPENDENCIES += libcap libcap-ng
+else
+QEMU_OPTS += --disable-cap-ng
+QEMU_VARS += cap=no
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_BLOBS),)
QEMU_OPTS += --disable-blobs
endif
@@ -181,7 +191,6 @@ define QEMU_CONFIGURE_CMDS
--disable-guest-base \
--disable-vde \
--disable-linux-aio \
- --disable-cap-ng \
--disable-docs \
--disable-spice \
--disable-rbd \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 32/47] package/qemu: add attr/xattr option
From: Yann E. MORIN @ 2012-10-24 21:25 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 6 ++++++
package/qemu/qemu.mk | 7 ++++++-
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index 6784d75..e15f14c 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -133,6 +133,12 @@ config BR2_PACKAGE_QEMU_CAP
help
Say 'y' here if you want QEMU to support capabilities.
+config BR2_PACKAGE_QEMU_ATTR
+ bool "Enable attr and xattr"
+ help
+ Say 'y' here to have QEMU support attributes (attr) and eXtended
+ attibutes (xattr).
+
config BR2_PACKAGE_QEMU_BLOBS
bool "Install binary blobs"
default y
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 56d0c3c..70d3f7e 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -100,6 +100,12 @@ QEMU_OPTS += --disable-cap-ng
QEMU_VARS += cap=no
endif
+ifeq ($(BR2_PACKAGE_QEMU_ATTR),y)
+QEMU_OPTS += --enable-attr
+else
+QEMU_OPTS += --disable-attr
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_BLOBS),)
QEMU_OPTS += --disable-blobs
endif
@@ -177,7 +183,6 @@ define QEMU_CONFIGURE_CMDS
--audio-card-list= \
--enable-kvm \
--enable-nptl \
- --enable-attr \
--enable-vhost-net \
--disable-xen \
--disable-slirp \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 33/47] package/qemu: add support for virtfs
From: Yann E. MORIN @ 2012-10-24 21:25 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 16 ++++++++++++++++
package/qemu/qemu.mk | 7 ++++++-
2 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index e15f14c..567b9af 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -115,6 +115,22 @@ config BR2_PACKAGE_QEMU_SDL
Say 'y' to enable the SDL frontend, that is, a graphical window
presenting the VM's display.
+comment "Block backends"
+
+config BR2_PACKAGE_QEMU_VIRTFS
+ bool "Enable plan9 ressources using VirtFS"
+ select BR2_PACKAGE_QEMU_CAP
+ select BR2_PACKAGE_QEMU_ATTR
+ help
+ Say 'y' here if you want QEMU to provide a plan9 virtual "share"
+ accessible from the guest OS for relatively fast access to host
+ files.
+
+ This requires that the guest OS is capable of accessing plan9
+ ressources (typically, in Linux, this is done by a network
+ file-system called 9p, and can be accelerated by using the 9p
+ virtio).
+
comment "Misc. features"
config BR2_PACKAGE_QEMU_UUID
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 70d3f7e..bc3f437 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -83,6 +83,12 @@ else
QEMU_OPTS += --disable-sdl
endif
+ifeq ($(BR2_PACKAGE_QEMU_VIRTFS),y)
+QEMU_OPTS += --enable-virtfs
+else
+QEMU_OPTS += --disable-virtfs
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_UUID),y)
QEMU_OPTS += --enable-uuid
QEMU_DEPENDENCIES += util-linux
@@ -187,7 +193,6 @@ define QEMU_CONFIGURE_CMDS
--disable-xen \
--disable-slirp \
--disable-vnc-sasl \
- --disable-virtfs \
--disable-brlapi \
--disable-curses \
--disable-curl \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 34/47] package/qemu: add support for cURL
From: Yann E. MORIN @ 2012-10-24 21:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
QEMU can use libcurl as a block backend, to access remote block devices.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 10 ++++++++++
package/qemu/qemu.mk | 8 +++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index 567b9af..d03e980 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -131,6 +131,16 @@ config BR2_PACKAGE_QEMU_VIRTFS
file-system called 9p, and can be accelerated by using the 9p
virtio).
+config BR2_PACKAGE_QEMU_CURL
+ bool "Enable remote block-devices using cURL"
+ depends on !BR2_PREFER_STATIC_LIB
+ select BR2_PACKAGE_LIBCURL
+ help
+ Say 'y' to access remote block-devices using libcurl.
+
+comment "cURL support is not possible with static linking"
+ depends on BR2_PREFER_STATIC_LIB
+
comment "Misc. features"
config BR2_PACKAGE_QEMU_UUID
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index bc3f437..6eb6e8f 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -89,6 +89,13 @@ else
QEMU_OPTS += --disable-virtfs
endif
+ifeq ($(BR2_PACKAGE_QEMU_CURL),y)
+QEMU_OPTS += --enable-curl
+QEMU_DEPENDENCIES += libcurl
+else
+QEMU_OPTS += --disable-curl
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_UUID),y)
QEMU_OPTS += --enable-uuid
QEMU_DEPENDENCIES += util-linux
@@ -195,7 +202,6 @@ define QEMU_CONFIGURE_CMDS
--disable-vnc-sasl \
--disable-brlapi \
--disable-curses \
- --disable-curl \
--disable-fdt \
--disable-bluez \
--disable-guest-base \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 35/47] package/qemu: enable use of the curses frontend
From: Yann E. MORIN @ 2012-10-24 21:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 11 +++++++++++
package/qemu/qemu.mk | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index d03e980..8dff88f 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -115,6 +115,17 @@ config BR2_PACKAGE_QEMU_SDL
Say 'y' to enable the SDL frontend, that is, a graphical window
presenting the VM's display.
+config BR2_PACKAGE_QEMU_CURSES
+ bool "Enable the curses frontend"
+ select BR2_PACKAGE_NCURSES
+ help
+ Say 'y' to use curses to display the text-mode of VGA outpout.
+
+ If the VM's graphic adapter does not support VGA text-mode, or it
+ is in graphical mode, then nothing will be displayed with this
+ frontend (although you can still use the SDL or VNC frontends to
+ display the graphical output).
+
comment "Block backends"
config BR2_PACKAGE_QEMU_VIRTFS
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 6eb6e8f..5f7021c 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -83,6 +83,13 @@ else
QEMU_OPTS += --disable-sdl
endif
+ifeq ($(BR2_PACKAGE_QEMU_CURSES),y)
+QEMU_OPTS += --enable-curses
+QEMU_DEPENDENCIES += ncurses
+else
+QEMU_OPTS += --disable-curses
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_VIRTFS),y)
QEMU_OPTS += --enable-virtfs
else
@@ -201,7 +208,6 @@ define QEMU_CONFIGURE_CMDS
--disable-slirp \
--disable-vnc-sasl \
--disable-brlapi \
- --disable-curses \
--disable-fdt \
--disable-bluez \
--disable-guest-base \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 36/47] package/qemu: add BlueZ connectivity
From: Yann E. MORIN @ 2012-10-24 21:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 11 +++++++++++
package/qemu/qemu.mk | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index 8dff88f..e467f59 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -152,6 +152,17 @@ config BR2_PACKAGE_QEMU_CURL
comment "cURL support is not possible with static linking"
depends on BR2_PREFER_STATIC_LIB
+comment "Networking"
+
+config BR2_PACKAGE_QEMU_BLUEZ
+ bool "Enable BlueZ connectivity"
+ depends on BR2_PACKAGE_BLUEZ_UTILS
+ help
+ Say 'y' here to enable BlueZ (bluetooth) connectivity in QEMU.
+
+comment "BlueZ connectivity depends on bluez-utils"
+ depends on !BR2_PACKAGE_BLUEZ_UTILS
+
comment "Misc. features"
config BR2_PACKAGE_QEMU_UUID
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 5f7021c..ac7087f 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -103,6 +103,13 @@ else
QEMU_OPTS += --disable-curl
endif
+ifeq ($(BR2_PACKAGE_QEMU_BLUEZ),y)
+QEMU_OPTS += --enable-bluez
+QEMU_DEPENDENCIES += bluez_utils
+else
+QEMU_OPTS += --disable-bluez
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_UUID),y)
QEMU_OPTS += --enable-uuid
QEMU_DEPENDENCIES += util-linux
@@ -209,7 +216,6 @@ define QEMU_CONFIGURE_CMDS
--disable-vnc-sasl \
--disable-brlapi \
--disable-fdt \
- --disable-bluez \
--disable-guest-base \
--disable-vde \
--disable-linux-aio \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 37/47] package/qemu: add AIO support
From: Yann E. MORIN @ 2012-10-24 21:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Add support for Asynchronous Input/Ouput (AIO).
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 9 +++++++++
package/qemu/qemu.mk | 8 +++++++-
2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index e467f59..3fffd60 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -152,6 +152,15 @@ config BR2_PACKAGE_QEMU_CURL
comment "cURL support is not possible with static linking"
depends on BR2_PREFER_STATIC_LIB
+config BR2_PACKAGE_QEMU_AIO
+ bool "Enable AIO"
+ depends on BR2_PACKAGE_LIBAIO
+ help
+ Say 'y' here to enable Asynchronous Input/Output (AIO).
+
+comment "AIO support depends on libaio"
+ depends on !BR2_PACKAGE_LIBAIO
+
comment "Networking"
config BR2_PACKAGE_QEMU_BLUEZ
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index ac7087f..62a935a 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -103,6 +103,13 @@ else
QEMU_OPTS += --disable-curl
endif
+ifeq ($(BR2_PACKAGE_QEMU_AIO),y)
+QEMU_OPTS += --enable-linux-aio
+QEMU_DEPENDENCIES += libaio
+else
+QEMU_OPTS += --disable-linux-aio
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_BLUEZ),y)
QEMU_OPTS += --enable-bluez
QEMU_DEPENDENCIES += bluez_utils
@@ -218,7 +225,6 @@ define QEMU_CONFIGURE_CMDS
--disable-fdt \
--disable-guest-base \
--disable-vde \
- --disable-linux-aio \
--disable-docs \
--disable-spice \
--disable-rbd \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 38/47] package/qemu: add support for FDT
From: Yann E. MORIN @ 2012-10-24 21:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
FDT is the Flat Device Tree, and allows QEMU to pass DTs to the VMs.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 7 +++++++
package/qemu/qemu.mk | 8 +++++++-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index 3fffd60..c718be4 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -174,6 +174,13 @@ comment "BlueZ connectivity depends on bluez-utils"
comment "Misc. features"
+config BR2_PACKAGE_QEMU_FDT
+ bool "Enable FDT"
+ select BR2_PACKAGE_DTC
+ help
+ Say 'y' here to have QEMU capable of constructing Device Trees,
+ and passing them to the VMs.
+
config BR2_PACKAGE_QEMU_UUID
bool "Enable VMs UUID"
depends on BR2_PACKAGE_UTIL_LINUX_LIBUUID
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 62a935a..1303b41 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -117,6 +117,13 @@ else
QEMU_OPTS += --disable-bluez
endif
+ifeq ($(BR2_PACKAGE_QEMU_FDT),y)
+QEMU_OPTS += --enable-fdt
+QEMU_DEPENDENCIES += dtc
+else
+QEMU_OPTS += --disable-fdt
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_UUID),y)
QEMU_OPTS += --enable-uuid
QEMU_DEPENDENCIES += util-linux
@@ -222,7 +229,6 @@ define QEMU_CONFIGURE_CMDS
--disable-slirp \
--disable-vnc-sasl \
--disable-brlapi \
- --disable-fdt \
--disable-guest-base \
--disable-vde \
--disable-docs \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 39/47] package/qemu: add support for VDE switches
From: Yann E. MORIN @ 2012-10-24 21:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 7 +++++++
package/qemu/qemu.mk | 8 +++++++-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index c718be4..78ec4c8 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -172,6 +172,13 @@ config BR2_PACKAGE_QEMU_BLUEZ
comment "BlueZ connectivity depends on bluez-utils"
depends on !BR2_PACKAGE_BLUEZ_UTILS
+config BR2_PACKAGE_QEMU_VDE
+ bool "Enable VDE"
+ select BR2_PACKAGE_VDE2
+ help
+ Say 'y' here to have QEMU connect to VDE (Virtual Distributed
+ Ethernet) switches.
+
comment "Misc. features"
config BR2_PACKAGE_QEMU_FDT
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 1303b41..ede431b 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -117,6 +117,13 @@ else
QEMU_OPTS += --disable-bluez
endif
+ifeq ($(BR2_PACKAGE_QEMU_VDE),y)
+QEMU_OPTS += --enable-vde
+QEMU_DEPENDENCIES += vde2
+else
+QEMU_OPTS += --disable-vde
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_FDT),y)
QEMU_OPTS += --enable-fdt
QEMU_DEPENDENCIES += dtc
@@ -230,7 +237,6 @@ define QEMU_CONFIGURE_CMDS
--disable-vnc-sasl \
--disable-brlapi \
--disable-guest-base \
- --disable-vde \
--disable-docs \
--disable-spice \
--disable-rbd \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 40/47] package/qemu: add iSCSI support
From: Yann E. MORIN @ 2012-10-24 21:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 6 ++++++
package/qemu/qemu.mk | 8 +++++++-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index 78ec4c8..e92a587 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -152,6 +152,12 @@ config BR2_PACKAGE_QEMU_CURL
comment "cURL support is not possible with static linking"
depends on BR2_PREFER_STATIC_LIB
+config BR2_PACKAGE_QEMU_ISCSI
+ bool "Enable remote block-devices using iSCSI"
+ select BR2_PACKAGE_LIBISCSI
+ help
+ Say 'y' here to have QEMU use iSCSI targets as block-devices.
+
config BR2_PACKAGE_QEMU_AIO
bool "Enable AIO"
depends on BR2_PACKAGE_LIBAIO
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index ede431b..d1d05e5 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -103,6 +103,13 @@ else
QEMU_OPTS += --disable-curl
endif
+ifeq ($(BR2_PACKAGE_QEMU_ISCSI),y)
+QEMU_OPTS += --enable-libiscsi
+QEMU_DEPENDENCIES += libiscsi
+else
+QEMU_OPTS += --disable-libiscsi
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_AIO),y)
QEMU_OPTS += --enable-linux-aio
QEMU_DEPENDENCIES += libaio
@@ -240,7 +247,6 @@ define QEMU_CONFIGURE_CMDS
--disable-docs \
--disable-spice \
--disable-rbd \
- --disable-libiscsi \
--disable-usb-redir \
--disable-smartcard \
--disable-strip \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 41/47] package/qemu: add support for USB redirection
From: Yann E. MORIN @ 2012-10-24 21:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 9 +++++++++
package/qemu/qemu.mk | 8 +++++++-
2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index e92a587..3f608cc 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -158,6 +158,15 @@ config BR2_PACKAGE_QEMU_ISCSI
help
Say 'y' here to have QEMU use iSCSI targets as block-devices.
+config BR2_PACKAGE_QEMU_USBREDIR
+ bool "Enable USB redirection"
+ depends on BR2_PACKAGE_USBREDIR
+ help
+ Say 'y' here to have QEMU support USB redirection over the network.
+
+comment "USB redirection requires usbredir"
+ depends on !BR2_PACKAGE_USBREDIR
+
config BR2_PACKAGE_QEMU_AIO
bool "Enable AIO"
depends on BR2_PACKAGE_LIBAIO
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index d1d05e5..a2d84e1 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -110,6 +110,13 @@ else
QEMU_OPTS += --disable-libiscsi
endif
+ifeq ($(BR2_PACKAGE_QEMU_USBREDIR),y)
+QEMU_OPTS += --enable-usb-redir
+QEMU_DEPENDENCIES += usbredir
+else
+QEMU_OPTS += --disable-usb-redir
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_AIO),y)
QEMU_OPTS += --enable-linux-aio
QEMU_DEPENDENCIES += libaio
@@ -247,7 +254,6 @@ define QEMU_CONFIGURE_CMDS
--disable-docs \
--disable-spice \
--disable-rbd \
- --disable-usb-redir \
--disable-smartcard \
--disable-strip \
--disable-seccomp \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 42/47] package/qemu: add support for Spice
From: Yann E. MORIN @ 2012-10-24 21:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 10 ++++++++++
package/qemu/qemu.mk | 8 +++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index 3f608cc..01962ea 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -126,6 +126,16 @@ config BR2_PACKAGE_QEMU_CURSES
frontend (although you can still use the SDL or VNC frontends to
display the graphical output).
+config BR2_PACKAGE_QEMU_SPICE
+ bool "Enable Spice frontend"
+ depends on BR2_PACKAGE_SPICE
+ help
+ Say 'y' here to have QEMU support Spice as a (VNC-like) frontend.
+
+if !BR2_PACKAGE_SPICE
+comment "Spice support requires spice-server"
+endif
+
comment "Block backends"
config BR2_PACKAGE_QEMU_VIRTFS
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index a2d84e1..69a5382 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -90,6 +90,13 @@ else
QEMU_OPTS += --disable-curses
endif
+ifeq ($(BR2_PACKAGE_QEMU_SPICE),y)
+QEMU_OPTS += --enable-spice
+QEMU_DEPENDENCIES += spice
+else
+QEMU_OPTS += --disable-spice
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_VIRTFS),y)
QEMU_OPTS += --enable-virtfs
else
@@ -252,7 +259,6 @@ define QEMU_CONFIGURE_CMDS
--disable-brlapi \
--disable-guest-base \
--disable-docs \
- --disable-spice \
--disable-rbd \
--disable-smartcard \
--disable-strip \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 43/47] package/qemu: enable sound
From: Yann E. MORIN @ 2012-10-24 21:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 38 ++++++++++++++++++++++++++++++++++++++
package/qemu/qemu.mk | 19 +++++++++++++++++--
2 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index 01962ea..a74fd4b 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -204,6 +204,44 @@ config BR2_PACKAGE_QEMU_VDE
Say 'y' here to have QEMU connect to VDE (Virtual Distributed
Ethernet) switches.
+comment "Sound"
+
+config BR2_PACKAGE_QEMU_SOUND_CARDS
+ string "Enable sound cards"
+ default "ac97 es1370 hda"
+ help
+ Enter here the list of sound cards you want QEMU to emulate.
+ The available sound cards are:
+ ac97 es1370 sb16 cs4231a adlib gus hda
+
+ The default is: ac97 es1370 hda
+
+ Note: even if you say 'n' to both alsa and SDL drivers, below, QEMU
+ always include the 'wav' driver, which stores the generated sound
+ into a file, and the 'none' driver, which discards generated sound.
+
+config BR2_PACKAGE_QEMU_MIXEMU
+ bool "Enable mixer emulation"
+ help
+ Say 'y' here to have QEMU emulate a mixer device.
+
+config BR2_PACKAGE_QEMU_SOUND_SDL
+ bool "Enable sound via SDL"
+ select BR2_PACKAGE_QEMU_SDL # Requires that SDL frontend be selected
+ select BR2_PACKAGE_SDL
+ help
+ Say 'y' here to have QEMU play sound from the VMs via SDL.
+
+ Note: this is only for system emulation, not user emulation.
+
+config BR2_PACKAGE_QEMU_SOUND_ALSA
+ bool "Enable sound via alsa"
+ select BR2_PACKAGE_ALSA_LIB
+ help
+ Say 'y' here to have QEMU play sound from the VMs via alsa.
+
+ Note: this is only for system emulation, not user emulation.
+
comment "Misc. features"
config BR2_PACKAGE_QEMU_FDT
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 69a5382..7609aea 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -145,6 +145,23 @@ else
QEMU_OPTS += --disable-vde
endif
+QEMU_SND_DRV =
+ifeq ($(BR2_PACKAGE_QEMU_SOUND_ALSA),y)
+QEMU_SND_DRV += alsa
+QEMU_DEPENDENCIES += alsa-lib
+endif
+ifeq ($(BR2_PACKAGE_QEMU_SOUND_SDL),y)
+QEMU_SND_DRV += sdl
+QEMU_DEPENDENCIES += sdl
+endif
+ifneq ($(QEMU_SND_DRV),)
+QEMU_OPTS += --audio-drv-list="$(QEMU_SND_DRV)"
+endif
+QEMU_OPTS += --audio-card-list=$(BR2_PACKAGE_QEMU_SOUND_CARDS)
+ifeq ($(BR2_PACKAGE_QEMU_MIXEMU),y)
+QEMU_OPTS += --enable-mixemu
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_FDT),y)
QEMU_OPTS += --enable-fdt
QEMU_DEPENDENCIES += dtc
@@ -248,8 +265,6 @@ define QEMU_CONFIGURE_CMDS
./configure \
--prefix=/usr \
--cross-prefix=$(TARGET_CROSS) \
- --audio-drv-list= \
- --audio-card-list= \
--enable-kvm \
--enable-nptl \
--enable-vhost-net \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 44/47] package/qemu: add support for libseccomp
From: Yann E. MORIN @ 2012-10-24 21:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 7 +++++++
package/qemu/qemu.mk | 7 ++++++-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index a74fd4b..0299f69 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -273,6 +273,13 @@ config BR2_PACKAGE_QEMU_ATTR
Say 'y' here to have QEMU support attributes (attr) and eXtended
attibutes (xattr).
+config BR2_PACKAGE_QEMU_SECCOMP
+ bool "Enable seccomp filter"
+ select BR2_PACKAGE_LIBSECCOMP
+ help
+ Say 'y' here to have QEMU to use the Linux kernel's seccomp filter,
+ to more tightly confine the VMs.
+
config BR2_PACKAGE_QEMU_BLOBS
bool "Install binary blobs"
default y
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 7609aea..d087291 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -192,6 +192,12 @@ else
QEMU_OPTS += --disable-attr
endif
+ifeq ($(BR2_PACKAGE_QEMU_SECCOMP),y)
+QEMU_OPTS += --enable-seccomp
+else
+QEMU_OPTS += --disable-seccomp
+endif
+
ifeq ($(BR2_PACKAGE_QEMU_BLOBS),)
QEMU_OPTS += --disable-blobs
endif
@@ -277,7 +283,6 @@ define QEMU_CONFIGURE_CMDS
--disable-rbd \
--disable-smartcard \
--disable-strip \
- --disable-seccomp \
--disable-sparse \
$(QEMU_OPTS) \
)
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 45/47] package/qemu: option to build the docs
From: Yann E. MORIN @ 2012-10-24 21:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/qemu.mk | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index d087291..199d230 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -202,6 +202,12 @@ ifeq ($(BR2_PACKAGE_QEMU_BLOBS),)
QEMU_OPTS += --disable-blobs
endif
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
+QEMU_OPTS += --enable-docs
+else
+QEMU_OPTS += --disable-docs
+endif
+
# Post-install removal of unwanted keymaps:
# - if we want 'all', we do nothing;
# - if we want none, we completely remove the keymap dir
@@ -279,7 +285,6 @@ define QEMU_CONFIGURE_CMDS
--disable-vnc-sasl \
--disable-brlapi \
--disable-guest-base \
- --disable-docs \
--disable-rbd \
--disable-smartcard \
--disable-strip \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 46/47] package/qemu: move sub-options into a sub-menu
From: Yann E. MORIN @ 2012-10-24 21:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
As there are now quite a few options to QEMU, move them into their own
sub-menu, so it looks a bit less crowded in the 'misc' menu.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/qemu/Config.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index 0299f69..a082cc8 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_QEMU_AVAILABLE
comment "qemu requires a toolchain with threads"
depends on !BR2_PACKAGE_QEMU_AVAILABLE
-config BR2_PACKAGE_QEMU
+menuconfig BR2_PACKAGE_QEMU
bool "QEMU"
depends on BR2_PACKAGE_QEMU_AVAILABLE
select BR2_PACKAGE_ZLIB
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 47/47] package/qemu: enable a static build
From: Yann E. MORIN @ 2012-10-24 21:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-1-git-send-email-yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
It can be useful to have a statically-linked QEMU (especially the
linux-user and bsd-user emulators) to avoid run-time issues with
dynamically-loaded libraries.
There is an issue where QEMU could not be able to properly (re)map
libraries in memory due to some overlap between its own memory
mappings and the mappings of the user application being translated
(it's a complex issue, so don't count on me to properly explain it,
I did not understood it completely either... :-/ ).
---
package/qemu/Config.in | 38 ++++++++++++++----
package/qemu/qemu-static-curl.patch | 72 +++++++++++++++++++++++++++++++++++
package/qemu/qemu-static-sdl.patch | 54 ++++++++++++++++++++++++++
package/qemu/qemu.mk | 4 ++
4 files changed, 159 insertions(+), 9 deletions(-)
create mode 100644 package/qemu/qemu-static-curl.patch
create mode 100644 package/qemu/qemu-static-sdl.patch
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index a082cc8..942c254 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -102,11 +102,11 @@ config BR2_PACKAGE_QEMU_VNC_JPEG
config BR2_PACKAGE_QEMU_VNC_TLS
bool "TLS encryption"
depends on BR2_PACKAGE_QEMU_VNC
- depends on !BR2_PREFER_STATIC_LIB
+ depends on !BR2_PACKAGE_QEMU_STATIC
select BR2_PACKAGE_GNUTLS
comment "VNC TLS encryption does not work for static link"
- depends on BR2_PACKAGE_QEMU_VNC && BR2_PREFER_STATIC_LIB
+ depends on BR2_PACKAGE_QEMU_VNC && BR2_PACKAGE_QEMU_STATIC
config BR2_PACKAGE_QEMU_SDL
bool "Enable SDL frontend"
@@ -129,11 +129,20 @@ config BR2_PACKAGE_QEMU_CURSES
config BR2_PACKAGE_QEMU_SPICE
bool "Enable Spice frontend"
depends on BR2_PACKAGE_SPICE
+ depends on !BR2_PACKAGE_QEMU_STATIC || BR2_PREFER_STATIC_LIB
help
Say 'y' here to have QEMU support Spice as a (VNC-like) frontend.
-
-if !BR2_PACKAGE_SPICE
-comment "Spice support requires spice-server"
+
+ Note:
+ Spice links against alsa-libs, but alsa-libs can't be built both
+ shared and static at the same time, so we can not link with a
+ static spice to get a static QEMU (BR2_PACKAGE_QEMU_STATIC) if
+ buildroot as a whole does not also build only static libraries
+ (BR2_PREFER_STATIC_LIB).
+
+if !BR2_PACKAGE_SPICE || ( BR2_PACKAGE_QEMU_STATIC && !BR2_PREFER_STATIC_LIB )
+comment "Spice support requires spice-server, and does not work for a static"
+comment "build of QEMU unless BR2_PREFER_STATIC_LIB is set, too"
endif
comment "Block backends"
@@ -154,14 +163,10 @@ config BR2_PACKAGE_QEMU_VIRTFS
config BR2_PACKAGE_QEMU_CURL
bool "Enable remote block-devices using cURL"
- depends on !BR2_PREFER_STATIC_LIB
select BR2_PACKAGE_LIBCURL
help
Say 'y' to access remote block-devices using libcurl.
-comment "cURL support is not possible with static linking"
- depends on BR2_PREFER_STATIC_LIB
-
config BR2_PACKAGE_QEMU_ISCSI
bool "Enable remote block-devices using iSCSI"
select BR2_PACKAGE_LIBISCSI
@@ -234,14 +239,21 @@ config BR2_PACKAGE_QEMU_SOUND_SDL
Note: this is only for system emulation, not user emulation.
+# Alsa can not build both shared and static libs at the same time.
+# But we may want to build QEMU staticaly, even though the global
+# BR2_PREFER_STATIC_LIB is not set. Disable that case.
config BR2_PACKAGE_QEMU_SOUND_ALSA
bool "Enable sound via alsa"
+ depends on !BR2_PACKAGE_QEMU_STATIC || BR2_PREFER_STATIC_LIB
select BR2_PACKAGE_ALSA_LIB
help
Say 'y' here to have QEMU play sound from the VMs via alsa.
Note: this is only for system emulation, not user emulation.
+comment "Alsa sound static link works only if BR2_PREFER_STATIC is set"
+ depends on BR2_PACKAGE_QEMU_STATIC && !BR2_PREFER_STATIC_LIB
+
comment "Misc. features"
config BR2_PACKAGE_QEMU_FDT
@@ -306,4 +318,12 @@ config BR2_PACKAGE_QEMU_KEYMAPS
- 'de fr* en-*' for german, french and english keymaps
- and so on (see the QEMU source for all supported keymaps)
+config BR2_PREFER_STATIC_LIB
+ select BR2_PACKAGE_QEMU_STATIC
+
+config BR2_PACKAGE_QEMU_STATIC
+ bool "Build statically"
+ help
+ Build static qemu executable(s).
+
endif # BR2_PACKAGE_QEMU
diff --git a/package/qemu/qemu-static-curl.patch b/package/qemu/qemu-static-curl.patch
new file mode 100644
index 0000000..0029d7d
--- /dev/null
+++ b/package/qemu/qemu-static-curl.patch
@@ -0,0 +1,72 @@
+configure: fix detection for cURL libs when static linking
+
+Currently, to check for cURL, configure uses either pkg-config (the default),
+or curl-config (as a fallback).
+
+But curl-config and pkg-config do not have the same set of options:
+ - to check for shared libs, both use the option: --libs
+ - to check for static libs:
+ - pkg-config uses: --static --libs
+ - curl-config uses: --static-libs
+
+To add to the complexity, pkg-config is called through the querry_pkg_config
+wrapper, that already passes --static when static linking is required, but
+there is no such wrapper for curl-config, so we miss the occasion to pass
+--static-libs
+
+To fix this:
+ - introduce a new variable QEMU_XXX_CONFIG_LIBS_FLAGS that mirrors the
+ behavior of QEMU_PKG_CONFIG_FLAGS; this variable can be used by all
+ xxx-config scripts (eg. curl-config, but later sdl-config too).
+ Default it to '--libs', which is for shared linking;
+ - properly use either --libs for pkg-config (--static is already takend
+ care of in the wrapper), or $QEMU_XXX_CONFIG_LIBS_FLAGS for
+ curl-config.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Patch sent upstream:
+ http://lists.nongnu.org/archive/html/qemu-trivial/2012-08/msg00165.html
+
+diff --git a/configure b/configure
+index d97fd81..e6a7c14 100755
+--- a/configure
++++ b/configure
+@@ -101,7 +101,7 @@ audio_win_int=""
+ cc_i386=i386-pc-linux-gnu-gcc
+ libs_qga=""
+ debug_info="yes"
+-
++QEMU_XXX_CONFIG_LIBS_FLAGS="--libs"
+ target_list=""
+
+ # Default value for a variable defining feature "foo".
+@@ -580,6 +580,7 @@ for opt do
+ static="yes"
+ LDFLAGS="-static $LDFLAGS"
+ QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS"
++ QEMU_XXX_CONFIG_LIBS_FLAGS="--static-libs"
+ ;;
+ --mandir=*) mandir="$optarg"
+ ;;
+@@ -1977,8 +1978,10 @@ fi
+
+ if $pkg_config libcurl --modversion >/dev/null 2>&1; then
+ curlconfig="$pkg_config libcurl"
++ curlconfiglibs="--libs"
+ else
+ curlconfig=curl-config
++ curlconfiglibs="$QEMU_XXX_CONFIG_LIBS_FLAGS"
+ fi
+
+ if test "$curl" != "no" ; then
+@@ -1987,7 +1990,7 @@ if test "$curl" != "no" ; then
+ int main(void) { curl_easy_init(); curl_multi_setopt(0, 0, 0); return 0; }
+ EOF
+ curl_cflags=`$curlconfig --cflags 2>/dev/null`
+- curl_libs=`$curlconfig --libs 2>/dev/null`
++ curl_libs=`$curlconfig $curlconfiglibs 2>/dev/null`
+ if compile_prog "$curl_cflags" "$curl_libs" ; then
+ curl=yes
+ libs_tools="$curl_libs $libs_tools"
diff --git a/package/qemu/qemu-static-sdl.patch b/package/qemu/qemu-static-sdl.patch
new file mode 100644
index 0000000..59e4a60
--- /dev/null
+++ b/package/qemu/qemu-static-sdl.patch
@@ -0,0 +1,54 @@
+configure: fix detection for SDL libs when static linking
+
+Currently, configure checks for SDL libs with either pkg-config (the
+default), or with sdl-config (as a fallback).
+
+As for cURL (previous patch), sdl-config does not have the same set of
+options as pkg-config:
+ - to check for shared libs, both use the option: --libs
+ - to check for static libs:
+ - pkg-config uses: --static --libs
+ - curl-config uses: --static-libs
+
+Fix that by using the previously introduced $QEMU_XXX_CONFIG_LIBS_FLAGS
+variable, the way ot was done previously for cURL.
+
+Also, simplify the code-path for checking for SDL libs with a single,
+non-conditional call to $sdlconfig, which is either pkg-config or
+sdl-config, as checked just above.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Patch sent upstream:
+ http://lists.nongnu.org/archive/html/qemu-trivial/2012-08/msg00166.html
+
+diff --git a/configure b/configure
+index e6a7c14..6bfedc7 100755
+--- a/configure
++++ b/configure
+@@ -1547,9 +1547,11 @@ fi
+
+ if $pkg_config sdl --modversion >/dev/null 2>&1; then
+ sdlconfig="$pkg_config sdl"
++ sdlconfiglibs="--libs"
+ _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'`
+ elif has ${sdl_config}; then
+ sdlconfig="$sdl_config"
++ sdlconfiglibs="$QEMU_XXX_CONFIG_LIBS_FLAGS"
+ _sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'`
+ else
+ if test "$sdl" = "yes" ; then
+@@ -1569,11 +1571,7 @@ if test "$sdl" != "no" ; then
+ int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
+ EOF
+ sdl_cflags=`$sdlconfig --cflags 2> /dev/null`
+- if test "$static" = "yes" ; then
+- sdl_libs=`$sdlconfig --static-libs 2>/dev/null`
+- else
+- sdl_libs=`$sdlconfig --libs 2> /dev/null`
+- fi
++ sdl_libs=`$sdlconfig $sdlconfiglibs 2> /dev/null`
+ if compile_prog "$sdl_cflags" "$sdl_libs" ; then
+ if test "$_sdlversion" -lt 121 ; then
+ sdl_too_old=yes
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 199d230..59149df 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -208,6 +208,10 @@ else
QEMU_OPTS += --disable-docs
endif
+ifeq ($(BR2_PACKAGE_QEMU_STATIC),y)
+QEMU_OPTS += --static
+endif
+
# Post-install removal of unwanted keymaps:
# - if we want 'all', we do nothing;
# - if we want none, we completely remove the keymap dir
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 18/47] package/libbsd: new package
From: Yann E. MORIN @ 2012-10-24 21:32 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-19-git-send-email-yann.morin.1998@free.fr>
On Wednesday 24 October 2012 Yann E. MORIN wrote:
> From: Yann E. MORIN <yann.morin@orange.com>
>
> Signed-off-by: "Yann E. MORIN" <yann.morin@orange.com>
Hmmm. Wrong identity... I used that a while ago to test my mail filters.
Sigh... :-/
I'll refresh the patch before it is submitted.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH] gqview: Fix build failure due to missing -lm
From: Valentine Barshak @ 2012-10-24 21:35 UTC (permalink / raw)
To: buildroot
In-Reply-To: <CAFbHwiSwLqa=JSw=yqsEmHO7sqvgRmPQEgR454g=rBCu0qLdOg@mail.gmail.com>
On 10/25/2012 12:51 AM, Will Newton wrote:
> On Wed, Oct 24, 2012 at 8:22 PM, Valentine Barshak <gvaxon@gmail.com> wrote:
>> On 10/07/2012 12:35 AM, Valentine Barshak wrote:
>>>
>>> Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
>>> ---
>>> package/gqview/gqview.mk | 1 +
>>> 1 file changed, 1 insertion(+)
>>>
>>> diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
>>> index 2f64cd0..7d09fda 100644
>>> --- a/package/gqview/gqview.mk
>>> +++ b/package/gqview/gqview.mk
>>> @@ -7,6 +7,7 @@ GQVIEW_VERSION = 2.1.5
>>> GQVIEW_SOURCE = gqview-$(GQVIEW_VERSION).tar.gz
>>> GQVIEW_SITE = http://prdownloads.sourceforge.net/gqview
>>> GQVIEW_DEPENDENCIES = host-pkg-config libgtk2
>>> +GQVIEW_CONF_ENV = LIBS="-lm"
>>>
>>> $(eval $(autotools-package))
>>>
>>>
>>
>> Does this work for everyone else or is it just deprecated and nobody should
>> use it?
>>
>> I can't build without -lm neither in BR nor using my native host tools.
>
> Which version of binutils are you using? 2.22?
>
Yes, 2.22.
Thanks,
Val.
^ permalink raw reply
* [Buildroot] [Bug 5624] When building directfb, BR2_TARGET_LDFLAGS not used by libtool
From: bugzilla at busybox.net @ 2012-10-24 22:00 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-5624-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=5624
--- Comment #3 from Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 2012-10-24 22:00:00 UTC ---
You mean globally (in package/Makefile.in) or specifically for this package?
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [PATCH] gnutls: fix link-time build failures
From: Gustavo Zacarias @ 2012-10-24 22:17 UTC (permalink / raw)
To: buildroot
Fixes
http://autobuild.buildroot.net/results/23da17446266bdd49ea0da0c1892d66d3ac6607f/build-end.log
And may the <BEEP> rest in peace at last...
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/gnutls/gnutls.mk | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index f9bab73..2634642 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -10,8 +10,9 @@ GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
GNUTLS_LICENSE = GPLv3+ LGPLv2.1+
GNUTLS_LICENSE_FILES = COPYING lib/COPYING
GNUTLS_DEPENDENCIES = host-pkgconf libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
+GNUTLS_CONF_ENV = acl_cv_rpath=no
GNUTLS_CONF_OPT = --with-libgcrypt --without-libgcrypt-prefix \
- --without-p11-kit
+ --without-p11-kit --disable-rpath
GNUTLS_INSTALL_STAGING = YES
$(eval $(autotools-package))
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [autobuild.buildroot.net] Build results for 2012-10-22
From: Gustavo Zacarias @ 2012-10-24 22:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <871ugpnthy.fsf@macbook.be.48ers.dk>
On 10/23/12 11:38, Peter Korsgaard wrote:
> This seems to be caused by the binutils sysroot patch. With that patch
> reverted the build works.
>
> Care to take a look?
Actually it's messed up rpath logic in gnutls... apply patch and may it
rest in peace once and for all.
Regarding gnutls we are testing a move to gnutls-3.x with Thomas,
that'll follow once a whole bunch of testing/fixing is done.
Regards.
^ permalink raw reply
* [Buildroot] [PATCHv2] gnutls: fix link-time build failures
From: Gustavo Zacarias @ 2012-10-24 22:20 UTC (permalink / raw)
To: buildroot
Fixes
http://autobuild.buildroot.net/results/23da17446266bdd49ea0da0c1892d66d3ac6607f/build-end.log
And may the <BEEP> rest in peace at last...
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/gnutls/gnutls.mk | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index e889821..1ef6e3f 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -10,8 +10,9 @@ GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
GNUTLS_LICENSE = GPLv3+ LGPLv2.1+
GNUTLS_LICENSE_FILES = COPYING lib/COPYING
GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)
+GNUTLS_CONF_ENV = acl_cv_rpath=no
GNUTLS_CONF_OPT = --with-libgcrypt --without-libgcrypt-prefix \
- --without-p11-kit
+ --without-p11-kit --disable-rpath
GNUTLS_INSTALL_STAGING = YES
$(eval $(autotools-package))
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCH 15/47] package/libseccomp: new package
From: Yann E. MORIN @ 2012-10-24 22:20 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351113973-17237-16-git-send-email-yann.morin.1998@free.fr>
All,
On Wednesday 24 October 2012 Yann E. MORIN wrote:
[--SNIP--]
> diff --git a/package/libseccomp/libseccomp-use-system-headers-from-sysroot.patch b/package/libseccomp/libseccomp-use-system-headers-from-sysroot.patch
> new file mode 100644
> index 0000000..f287377
> --- /dev/null
> +++ b/package/libseccomp/libseccomp-use-system-headers-from-sysroot.patch
> @@ -0,0 +1,19 @@
> +diff -du libseccomp-1.0.0.orig/configure libseccomp-1.0.0/configure
> +--- libseccomp-1.0.0.orig/configure 2012-07-27 22:35:05.000000000 +0200
> ++++ libseccomp-1.0.0/configure 2012-09-07 00:00:09.918429292 +0200
> +@@ -205,7 +205,8 @@
> + #
> +
> + # system seccomp includes
> +-if [[ -r "/usr/include/linux/seccomp.h" ]]; then
> ++# ${SYSROOT} added by buildroot for cross-compilation
> ++if [[ -r "${SYSROOT}/usr/include/linux/seccomp.h" ]]; then
> + opt_sysinc_seccomp="yes"
> + else
> + opt_sysinc_seccomp="no"
> +Common subdirectories: libseccomp-1.0.0.orig/doc and libseccomp-1.0.0/doc
> +Common subdirectories: libseccomp-1.0.0.orig/include and libseccomp-1.0.0/include
> +Common subdirectories: libseccomp-1.0.0.orig/install and libseccomp-1.0.0/install
> +Common subdirectories: libseccomp-1.0.0.orig/src and libseccomp-1.0.0/src
> +Common subdirectories: libseccomp-1.0.0.orig/tests and libseccomp-1.0.0/tests
> +Common subdirectories: libseccomp-1.0.0.orig/tools and libseccomp-1.0.0/tools
Hmm. I'll have to rework that patch before it can be included...
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox