* [Buildroot] [PATCH 14/20] package/keyutils: new package
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355435224.git.yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Jarkko Sakkinen <jarkko.sakkinen@iki.fi>
---
package/Config.in | 1 +
package/keyutils/Config.in | 7 ++
.../keyutils-01-memleak-from-realloc.patch | 51 +++++++++++++++
package/keyutils/keyutils-02-another-memleak.patch | 32 ++++++++++
package/keyutils/keyutils-03-cifs.patch | 15 +++++
.../keyutils-04-Makefile-for-buildroot.patch | 65 ++++++++++++++++++++
.../keyutils/keyutils-05-fix-install-rule.patch | 19 ++++++
package/keyutils/keyutils.mk | 32 ++++++++++
8 files changed, 222 insertions(+), 0 deletions(-)
create mode 100644 package/keyutils/Config.in
create mode 100644 package/keyutils/keyutils-01-memleak-from-realloc.patch
create mode 100644 package/keyutils/keyutils-02-another-memleak.patch
create mode 100644 package/keyutils/keyutils-03-cifs.patch
create mode 100644 package/keyutils/keyutils-04-Makefile-for-buildroot.patch
create mode 100644 package/keyutils/keyutils-05-fix-install-rule.patch
create mode 100644 package/keyutils/keyutils.mk
diff --git a/package/Config.in b/package/Config.in
index 6ab638d..c90fcd8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -738,6 +738,7 @@ endif
source "package/bwm-ng/Config.in"
source "package/cpuload/Config.in"
source "package/htop/Config.in"
+source "package/keyutils/Config.in"
source "package/kmod/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/module-init-tools/Config.in"
diff --git a/package/keyutils/Config.in b/package/keyutils/Config.in
new file mode 100644
index 0000000..9b5a24b
--- /dev/null
+++ b/package/keyutils/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KEYUTILS
+ bool "keyutils"
+ help
+ These tools are used to control the key management system
+ built into the Linux kernel.
+
+ http://people.redhat.com/~dhowells/keyutils/
diff --git a/package/keyutils/keyutils-01-memleak-from-realloc.patch b/package/keyutils/keyutils-01-memleak-from-realloc.patch
new file mode 100644
index 0000000..0faa9d8
--- /dev/null
+++ b/package/keyutils/keyutils-01-memleak-from-realloc.patch
@@ -0,0 +1,51 @@
+Patch vampirised from Debian's packaging of keyutils-1.4
+
+Author: Michael Gebetsroither <gebi@grml.org>
+Description: Fixed memleak from realloc (Closes: #496466).
+
+diff -Naurp keyutils.orig/keyutils.c keyutils/keyutils.c
+--- keyutils.orig/keyutils.c 2008-08-09 21:46:52.000000000 +0200
++++ keyutils/keyutils.c 2008-08-25 13:38:07.000000000 +0200
+@@ -165,6 +165,24 @@ long keyctl_assume_authority(key_serial_
+ return keyctl(KEYCTL_ASSUME_AUTHORITY, id);
+ }
+
++
++/*****************************************************************************/
++/*
++ * plain realloc is just crazy
++ */
++static void* __xrealloc(void* ptr, size_t size)
++{
++ void* ret;
++
++ ret = realloc(ptr, size);
++ if(!ret) {
++ free(ptr);
++ return 0;
++ }
++ return ret;
++}
++
++
+ /*****************************************************************************/
+ /*
+ * fetch key description into an allocated buffer
+@@ -194,7 +212,7 @@ int keyctl_describe_alloc(key_serial_t i
+ break;
+
+ buflen = ret;
+- buf = realloc(buf, buflen);
++ buf = __xrealloc(buf, buflen);
+ if (!buf)
+ return -1;
+ }
+@@ -233,7 +251,7 @@ int keyctl_read_alloc(key_serial_t id, v
+ break;
+
+ buflen = ret;
+- buf = realloc(buf, buflen + 1);
++ buf = __xrealloc(buf, buflen + 1);
+ if (!buf)
+ return -1;
+ }
diff --git a/package/keyutils/keyutils-02-another-memleak.patch b/package/keyutils/keyutils-02-another-memleak.patch
new file mode 100644
index 0000000..f74fd79
--- /dev/null
+++ b/package/keyutils/keyutils-02-another-memleak.patch
@@ -0,0 +1,32 @@
+Patch vampirised from Debian's packaging of keyutils-1.4
+
+Author: Michael Gebetsroither <gebi@grml.org>
+Description: Fixed another memleak (Closes: #496466).
+
+diff -Naurp keyutils.orig/keyutils.c keyutils/keyutils.c
+--- keyutils.orig/keyutils.c 2008-08-09 21:46:52.000000000 +0200
++++ keyutils/keyutils.c 2008-08-25 13:38:25.000000000 +0200
+@@ -187,8 +187,10 @@ int keyctl_describe_alloc(key_serial_t i
+
+ for (;;) {
+ ret = keyctl_describe(id, buf, buflen);
+- if (ret < 0)
++ if (ret < 0) {
++ free(buf);
+ return -1;
++ }
+
+ if (buflen >= ret)
+ break;
+@@ -226,8 +228,10 @@ int keyctl_read_alloc(key_serial_t id, v
+
+ for (;;) {
+ ret = keyctl_read(id, buf, buflen);
+- if (ret < 0)
++ if (ret < 0) {
++ free(buf);
+ return -1;
++ }
+
+ if (buflen >= ret)
+ break;
diff --git a/package/keyutils/keyutils-03-cifs.patch b/package/keyutils/keyutils-03-cifs.patch
new file mode 100644
index 0000000..b2903f9
--- /dev/null
+++ b/package/keyutils/keyutils-03-cifs.patch
@@ -0,0 +1,15 @@
+Patch vampirised from Debian's packaging of keyutils-1.4
+
+Author: Marcus Meissner <meissner@suse.de>
+Description: Added 2 cifs helpers to request-key.conf (for CIFS DFS support)
+
+diff -Naurp keyutils.orig/request-key.conf keyutils/request-key.conf
+--- keyutils.orig/request-key.conf 2008-09-07 23:53:10.000000000 +0000
++++ keyutils/request-key.conf 2009-02-05 00:53:00.000000000 +0000
+@@ -34,4 +34,6 @@
+ create user debug:* negate /bin/keyctl negate %k 30 %S
+ create user debug:loop:* * |/bin/cat
+ create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S
++create cifs.spnego * * /usr/sbin/cifs.upcall -c %k
++create dns_resolver * * /usr/sbin/cifs.upcall %k
+ negate * * * /bin/keyctl negate %k 30 %S
diff --git a/package/keyutils/keyutils-04-Makefile-for-buildroot.patch b/package/keyutils/keyutils-04-Makefile-for-buildroot.patch
new file mode 100644
index 0000000..e10abd5
--- /dev/null
+++ b/package/keyutils/keyutils-04-Makefile-for-buildroot.patch
@@ -0,0 +1,65 @@
+diff -durN keyutils-1.5.5.orig/Makefile keyutils-1.5.5/Makefile
+--- keyutils-1.5.5.orig/Makefile 2011-11-30 16:27:43.000000000 +0100
++++ keyutils-1.5.5/Makefile 2012-08-14 17:06:07.064412101 +0200
+@@ -1,7 +1,5 @@
+-CPPFLAGS := -I.
+-CFLAGS := -g -Wall -Werror
+-INSTALL := install
+-DESTDIR :=
++CPPFLAGS += -I.
++CFLAGS += -g -Wall -Werror
+ SPECFILE := keyutils.spec
+ NO_GLIBC_KEYERR := 0
+ NO_ARLIB := 0
+@@ -14,7 +12,7 @@
+ MAN5 := /usr/share/man/man5
+ MAN8 := /usr/share/man/man8
+ INCLUDEDIR := /usr/include
+-LNS := ln -sf
++LNS := $(LN) -sf
+
+ ###############################################################################
+ #
+@@ -48,29 +46,6 @@
+
+ ###############################################################################
+ #
+-# Guess at the appropriate lib directory and word size
+-#
+-###############################################################################
+-LIBDIR := $(shell ldd /usr/bin/make | grep '\(/libc\)' | sed -e 's!.*\(/.*\)/libc[.].*!\1!')
+-USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR))
+-BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit
+-
+-LNS := ln -sf
+-
+-ifeq ($(BUILDFOR),32-bit)
+-CFLAGS += -m32
+-LIBDIR := /lib
+-USRLIBDIR := /usr/lib
+-else
+-ifeq ($(BUILDFOR),64-bit)
+-CFLAGS += -m64
+-LIBDIR := /lib64
+-USRLIBDIR := /usr/lib64
+-endif
+-endif
+-
+-###############################################################################
+-#
+ # This is necessary if glibc doesn't know about the key management error codes
+ #
+ ###############################################################################
+@@ -110,10 +85,10 @@
+
+
+ $(DEVELLIB): $(SONAME)
+- ln -sf $< $@
++ $(LNS) $< $@
+
+ $(SONAME): $(LIBNAME)
+- ln -sf $< $@
++ $(LNS) $< $@
+
+ LIBVERS := -shared -Wl,-soname,$(SONAME) -Wl,--version-script,version.lds
+
diff --git a/package/keyutils/keyutils-05-fix-install-rule.patch b/package/keyutils/keyutils-05-fix-install-rule.patch
new file mode 100644
index 0000000..74e5670
--- /dev/null
+++ b/package/keyutils/keyutils-05-fix-install-rule.patch
@@ -0,0 +1,19 @@
+Makefile: fix install rule
+
+Do not link the .so with an absolute path, otherwise it may point to
+the host library.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN keyutils-1.5.5.orig/Makefile keyutils-1.5.5/Makefile
+--- keyutils-1.5.5.orig/Makefile 2012-10-22 20:11:57.188548033 +0200
++++ keyutils-1.5.5/Makefile 2012-10-22 20:14:40.868236838 +0200
+@@ -127,7 +127,7 @@
+ $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+ $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
+ mkdir -p $(DESTDIR)$(USRLIBDIR)
+- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
++ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
+ $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
+ $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
+ $(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh
diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk
new file mode 100644
index 0000000..184b58d
--- /dev/null
+++ b/package/keyutils/keyutils.mk
@@ -0,0 +1,32 @@
+#############################################################
+#
+# keyutils
+#
+##############################################################
+
+KEYUTILS_VERSION = 1.5.5
+KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2
+KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils
+KEYUTILS_LICENSE = GPLv2+ LGPLv2.1+
+KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL
+KEYUTILS_INSTALL_STAGING = YES
+
+KEYUTILS_MAKE_ENV = \
+ INSTALL=$(INSTALL) \
+ LIBDIR=/usr/lib \
+ USRLIBDIR=/usr/lib \
+ LN=$(HOSTLN) \
+
+define KEYUTILS_BUILD_CMDS
+ $(KEYUTILS_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+endef
+
+define KEYUTILS_INSTALL_STAGING_CMDS
+ $(KEYUTILS_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
+endef
+
+define KEYUTILS_INSTALL_TARGET_CMDS
+ $(KEYUTILS_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 13/20] package/libseccomp: new package
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355435224.git.yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/Config.in | 1 +
package/libseccomp/Config.in | 13 +++++++++++
| 17 +++++++++++++++
package/libseccomp/libseccomp.mk | 22 ++++++++++++++++++++
4 files changed, 53 insertions(+), 0 deletions(-)
create mode 100644 package/libseccomp/Config.in
create mode 100644 package/libseccomp/libseccomp-use-system-headers-from-sysroot.patch
create mode 100644 package/libseccomp/libseccomp.mk
diff --git a/package/Config.in b/package/Config.in
index 79a1342..6ab638d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -521,6 +521,7 @@ source "package/libical/Config.in"
source "package/libnspr/Config.in"
source "package/libsigc/Config.in"
source "package/libtpl/Config.in"
+source "package/libseccomp/Config.in"
source "package/liburcu/Config.in"
source "package/linux-pam/Config.in"
source "package/lttng-libust/Config.in"
diff --git a/package/libseccomp/Config.in b/package/libseccomp/Config.in
new file mode 100644
index 0000000..183cf4e
--- /dev/null
+++ b/package/libseccomp/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBSECCOMP
+ bool "libseccomp"
+ help
+ High level interface to the Linux Kernel's seccomp filter
+
+ The libseccomp library provides and easy to use, platform independent,
+ interface to the Linux Kernel's syscall filtering mechanism: seccomp.
+ The libseccomp API is designed to abstract away the underlying BPF
+ based syscall filter language and present a more conventional
+ function-call based filtering interface that should be familiar to,
+ and easily adopted by application developers.
+
+ http://sourceforge.net/projects/libseccomp/
--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..0997edd
--- /dev/null
+++ b/package/libseccomp/libseccomp-use-system-headers-from-sysroot.patch
@@ -0,0 +1,17 @@
+configure: check headers in sysroot, not in host's system headers
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN 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-10-27 00:12:50.739196219 +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"
diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk
new file mode 100644
index 0000000..73fe632
--- /dev/null
+++ b/package/libseccomp/libseccomp.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# libseccomp
+#
+#############################################################
+
+LIBSECCOMP_VERSION = 1.0.0
+LIBSECCOMP_SOURCE = libseccomp-$(LIBSECCOMP_VERSION).tar.gz
+LIBSECCOMP_SITE = http://downloads.sourceforge.net/project/libseccomp
+LIBSECCOMP_LICENSE = LGPLv2.1
+LIBSECCOMP_LICENSE_FILES = LICENSE
+LIBSECCOMP_INSTALL_STAGING = YES
+
+# Needed for configure to find our system headers:
+LIBSECCOMP_CONF_ENV = SYSROOT=$(STAGING_DIR)
+LIBSECCOMP_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
+LIBSECCOMP_MAKE_OPT = SUBDIRS_BUILD=src
+LIBSECCOMP_INSTALL_STAGING_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
+LIBSECCOMP_INSTALL_TARGET_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
+
+# Not a real autotools package, but works quite OK nonetheless
+$(eval $(autotools-package))
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 12/20] package/spice: enable slirp support
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355435224.git.yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/spice/Config.in | 7 +++++++
package/spice/spice.mk | 8 +++++++-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/package/spice/Config.in b/package/spice/Config.in
index 08c3893..b1e187a 100644
--- a/package/spice/Config.in
+++ b/package/spice/Config.in
@@ -41,4 +41,11 @@ config BR2_PACKAGE_SPICE_GUI
Say 'y' here to enable the Graphical User Interface (GUI)
start dialog.
+config BR2_PACKAGE_SPICE_TUNNEL
+ bool "Enable network redirection"
+ select BR2_PACKAGE_SLIRP
+ help
+ Say 'y' here to enable network redirection, aka tunnelling
+ through a SLIP/SLIRP session.
+
endif # BR2_PACKAGE_SPICE
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index 0a5c58e..78ca202 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -22,7 +22,6 @@ SPICE_DEPENDENCIES = \
# We disable everything for now, because the dependency tree can become
# quite deep if we try to enable some features, and I have not tested that.
SPICE_CONF_OPT = \
- --disable-tunnel \
--disable-opengl \
--disable-smartcard \
--disable-automated-tests \
@@ -44,6 +43,13 @@ else
SPICE_CONF_OPT += --disable-gui
endif
+ifeq ($(BR2_PACKAGE_SPICE_TUNNEL),y)
+SPICE_CONF_OPT += --enable-tunnel
+SPICE_DEPENDENCIES += slirp
+else
+SPICE_CONF_OPT += --disable-tunnel
+endif
+
SPICE_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
SPICE_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 11/20] package/spice: enable GUI
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355435224.git.yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/spice/Config.in | 8 ++++++++
package/spice/spice.mk | 8 +++++++-
2 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/package/spice/Config.in b/package/spice/Config.in
index aacc779..08c3893 100644
--- a/package/spice/Config.in
+++ b/package/spice/Config.in
@@ -33,4 +33,12 @@ config BR2_PACKAGE_SPICE_CLIENT
select BR2_PACKAGE_XLIB_LIBXFIXES
select BR2_PACKAGE_XLIB_LIBXRANDR
+config BR2_PACKAGE_SPICE_GUI
+ bool "Enable GUI"
+ depends on BR2_PACKAGE_SPICE_CLIENT
+ select BR2_PACKAGE_CEGUI06
+ help
+ Say 'y' here to enable the Graphical User Interface (GUI)
+ start dialog.
+
endif # BR2_PACKAGE_SPICE
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index 2f7fc20..0a5c58e 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -23,7 +23,6 @@ SPICE_DEPENDENCIES = \
# quite deep if we try to enable some features, and I have not tested that.
SPICE_CONF_OPT = \
--disable-tunnel \
- --disable-gui \
--disable-opengl \
--disable-smartcard \
--disable-automated-tests \
@@ -38,6 +37,13 @@ else
SPICE_CONF_OPT += --disable-client
endif
+ifeq ($(BR2_PACKAGE_SPICE_GUI),y)
+SPICE_CONF_OPT += --enable-gui
+SPICE_DEPENDENCIES += cegui06
+else
+SPICE_CONF_OPT += --disable-gui
+endif
+
SPICE_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
SPICE_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 10/20] package/spice: enable client
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355435224.git.yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/spice/Config.in | 13 +++++++++++++
package/spice/spice.mk | 8 +++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/package/spice/Config.in b/package/spice/Config.in
index 086b1bc..aacc779 100644
--- a/package/spice/Config.in
+++ b/package/spice/Config.in
@@ -21,3 +21,16 @@ config BR2_PACKAGE_SPICE
This package implements the server-part of Spice.
http://www.spice-space.org/
+
+if BR2_PACKAGE_SPICE
+
+comment "client depends on X.org"
+ depends on !BR2_PACKAGE_XORG7
+
+config BR2_PACKAGE_SPICE_CLIENT
+ bool "Enable client"
+ depends on BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBXFIXES
+ select BR2_PACKAGE_XLIB_LIBXRANDR
+
+endif # BR2_PACKAGE_SPICE
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index 2752b8a..2f7fc20 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -26,12 +26,18 @@ SPICE_CONF_OPT = \
--disable-gui \
--disable-opengl \
--disable-smartcard \
- --disable-client \
--disable-automated-tests \
--without-sasl \
SPICE_DEPENDENCIES += host-pkgconf
+ifeq ($(BR2_PACKAGE_SPICE_CLIENT),y)
+SPICE_CONF_OPT += --enable-client
+SPICE_DEPENDENCIES += xlib_libXfixes xlib_libXrandr
+else
+SPICE_CONF_OPT += --disable-client
+endif
+
SPICE_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
SPICE_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 09/20] package/spice: new package
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355435224.git.yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/Config.in | 1 +
package/spice/Config.in | 23 +++++++++++++++++
package/spice/spice.mk | 62 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 86 insertions(+), 0 deletions(-)
create mode 100644 package/spice/Config.in
create mode 100644 package/spice/spice.mk
diff --git a/package/Config.in b/package/Config.in
index f0de519..79a1342 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -663,6 +663,7 @@ source "package/socat/Config.in"
source "package/socketcand/Config.in"
source "package/spawn-fcgi/Config.in"
source "package/spice-protocol/Config.in"
+source "package/spice/Config.in"
source "package/squid/Config.in"
source "package/stunnel/Config.in"
source "package/tcpdump/Config.in"
diff --git a/package/spice/Config.in b/package/spice/Config.in
new file mode 100644
index 0000000..086b1bc
--- /dev/null
+++ b/package/spice/Config.in
@@ -0,0 +1,23 @@
+comment "spice server depends on python (for pyparsing)"
+ depends on !BR2_PACKAGE_PYTHON
+
+config BR2_PACKAGE_SPICE
+ bool "spice server"
+ depends on BR2_PACKAGE_PYTHON
+ select BR2_PACKAGE_ALSA_LIB
+ select BR2_PACKAGE_CELT051
+ select BR2_PACKAGE_JPEG
+ select BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_PIXMAN
+ select BR2_PACKAGE_PYTHON_PYPARSING
+ select BR2_PACKAGE_SPICE_PROTOCOL
+ help
+ The Spice project aims to provide a complete open source
+ solution for interaction with virtualized desktop devices.
+ The Spice project deals with both the virtualized devices
+ and the front-end. Interaction between front-end and
+ back-end is done using VD-Interfaces.
+
+ This package implements the server-part of Spice.
+
+ http://www.spice-space.org/
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
new file mode 100644
index 0000000..2752b8a
--- /dev/null
+++ b/package/spice/spice.mk
@@ -0,0 +1,62 @@
+#############################################################
+#
+# Spice
+#
+#############################################################
+
+SPICE_VERSION = 0.12.0
+SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2
+SPICE_SITE = http://www.spice-space.org/download/releases/
+SPICE_LICENSE = LGPLv2.1+
+SPICE_LICENSE_FILES = COPYING
+SPICE_INSTALL_STAGING = YES
+SPICE_DEPENDENCIES = \
+ alsa-lib \
+ celt051 \
+ jpeg \
+ openssl \
+ pixman \
+ python-pyparsing \
+ spice-protocol \
+
+# We disable everything for now, because the dependency tree can become
+# quite deep if we try to enable some features, and I have not tested that.
+SPICE_CONF_OPT = \
+ --disable-tunnel \
+ --disable-gui \
+ --disable-opengl \
+ --disable-smartcard \
+ --disable-client \
+ --disable-automated-tests \
+ --without-sasl \
+
+SPICE_DEPENDENCIES += host-pkgconf
+
+SPICE_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
+SPICE_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
+
+# We need to tweak spice.pc because it /forgets/ (for static linking) that
+# it should link against libz and libjpeg. libz is pkg-config-aware, while
+# libjpeg isn't, hence the two-line tweak
+define SPICE_POST_INSTALL_STAGING_FIX_PC
+ $(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;' \
+ "$(STAGING_DIR)/usr/lib/pkgconfig/spice-server.pc"
+endef
+SPICE_POST_INSTALL_STAGING_HOOKS += SPICE_POST_INSTALL_STAGING_FIX_PC
+
+# It is currently not possible to detect if stack-protection is available
+# or not, because it requires support from both the compiler *and* the
+# C library, but the C library (eg. uClibc) can be compiled without that
+# support, even if gcc accepts the -fstack-protector-all option.
+# spice's ./configure only checks for gcc's -fstack-protector-all option,
+# so it misses the case where the C library doe not provide the requires
+# support.
+# A correct fix would be to fix spice's ./configure to also check the C
+# library, but it might be much more involved.
+# So, we simply disable it for now. After all, as uClibc's help puts it:
+# Note that NOEXECSTACK on a kernel with address space randomization
+# is generally sufficient to prevent most buffer overflow exploits
+# without increasing code size.
+SPICE_CONF_OPT += gl_cv_warn__fstack_protector_all=no
+
+$(eval $(autotools-package))
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 08/20] package/spice-protocol: new package
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355435224.git.yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/Config.in | 1 +
package/spice-protocol/Config.in | 12 ++++++++++++
package/spice-protocol/spice-protocol.mk | 14 ++++++++++++++
3 files changed, 27 insertions(+), 0 deletions(-)
create mode 100644 package/spice-protocol/Config.in
create mode 100644 package/spice-protocol/spice-protocol.mk
diff --git a/package/Config.in b/package/Config.in
index 6bdfa2b..f0de519 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -662,6 +662,7 @@ source "package/ser2net/Config.in"
source "package/socat/Config.in"
source "package/socketcand/Config.in"
source "package/spawn-fcgi/Config.in"
+source "package/spice-protocol/Config.in"
source "package/squid/Config.in"
source "package/stunnel/Config.in"
source "package/tcpdump/Config.in"
diff --git a/package/spice-protocol/Config.in b/package/spice-protocol/Config.in
new file mode 100644
index 0000000..b354361
--- /dev/null
+++ b/package/spice-protocol/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_SPICE_PROTOCOL
+ bool "spice protocol"
+ help
+ The Spice project aims to provide a complete open source
+ solution for interaction with virtualized desktop devices.
+ The Spice project deals with both the virtualized devices
+ and the front-end. Interaction between front-end and
+ back-end is done using VD-Interfaces.
+
+ This package implements the protocol-part of Spice.
+
+ http://www.spice-space.org/
diff --git a/package/spice-protocol/spice-protocol.mk b/package/spice-protocol/spice-protocol.mk
new file mode 100644
index 0000000..dcfe50d
--- /dev/null
+++ b/package/spice-protocol/spice-protocol.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# Spice-protocol
+#
+#############################################################
+
+SPICE_PROTOCOL_VERSION = 0.12.2
+SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2
+SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases/
+SPICE_PROTOCOL_LICENSE = BSD-3c
+SPICE_PROTOCOL_LICENSE_FILES = COPYING
+SPICE_PROTOCOL_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 07/20] package/slirp: new package
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355435224.git.yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 +
package/slirp/Config.in | 25 +++++++++++++++++++++++++
package/slirp/slirp.mk | 21 +++++++++++++++++++++
3 files changed, 47 insertions(+), 0 deletions(-)
create mode 100644 package/slirp/Config.in
create mode 100644 package/slirp/slirp.mk
diff --git a/package/Config.in b/package/Config.in
index 61e1d60d..6bdfa2b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -494,6 +494,7 @@ source "package/libupnp/Config.in"
source "package/libvncserver/Config.in"
source "package/nss-mdns/Config.in"
source "package/ortp/Config.in"
+source "package/slirp/Config.in"
source "package/usbredir/Config.in"
source "package/zeromq/Config.in"
endmenu
diff --git a/package/slirp/Config.in b/package/slirp/Config.in
new file mode 100644
index 0000000..dedded3
--- /dev/null
+++ b/package/slirp/Config.in
@@ -0,0 +1,25 @@
+config BR2_PACKAGE_SLIRP
+ bool "slirp"
+ help
+ The Spice project aims to provide a complete open source
+ solution for interaction with virtualized desktop devices.
+ The Spice project deals with both the virtualized devices
+ and the front-end. Interaction between front-end and
+ back-end is done using VD-Interfaces.
+
+ This package implements the slirp-part for Spice.
+ Slirp emulates a PPP or SLIP connection over a normal terminal.
+
+ http://www.spice-space.org/
+
+ NOTE:
+ This package has some history of a unique kind:
+ - originally developped as 'slirp' by Danny Gasparovski, and
+ seemingly abandonned (developper /disapeared/)
+ - then re-maintained at sourceforge by "Kelly", up to some
+ time around 2009: http://slirp.sourceforge.net/
+ - during that period, QEMU (Fabrice BELLARD) forked the code
+ and included it in QEMU
+ - and it was imported from this breed by the Spice project
+ around May 2009
+ - which is what we use here
diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk
new file mode 100644
index 0000000..b3f4bcd
--- /dev/null
+++ b/package/slirp/slirp.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# Spice-slirp
+#
+#############################################################
+
+# There's no tarball releases of slirp, so we use the git repo
+# Also, there's no tag, so we use a random SHA1 (master's HEAD
+# of today)
+SLIRP_VERSION = 8c2da74c1385242f20799fec8c04f8378edc6550
+SLIRP_SITE = git://anongit.freedesktop.org/spice/slirp
+SLIRP_LICENSE = BSD-4c BSD-2c
+# Note: The license file 'COPYRIGHT' is missing from the sources,
+# although some files refer to it.
+SLIRP_INSTALL_STAGING = YES
+
+# As we're using the git tree, there's no ./configure,
+# so we need to autoreconf.
+SLIRP_AUTORECONF = YES
+
+$(eval $(autotools-package))
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 06/20] package/cegui06: new package
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355435224.git.yann.morin.1998@free.fr>
Although there are more recent versions of CEGUI, we are stuck
with 0.6.2b for use by spice.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
---
package/Config.in | 1 +
package/cegui06/Config.in | 15 +++++++++++++
package/cegui06/cegui06-stddef.h.patch | 26 +++++++++++++++++++++++
package/cegui06/cegui06.mk | 36 ++++++++++++++++++++++++++++++++
4 files changed, 78 insertions(+), 0 deletions(-)
create mode 100644 package/cegui06/Config.in
create mode 100644 package/cegui06/cegui06-stddef.h.patch
create mode 100644 package/cegui06/cegui06.mk
diff --git a/package/Config.in b/package/Config.in
index d00ebf3..61e1d60d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -109,6 +109,7 @@ comment "Graphic applications"
source "package/rrdtool/Config.in"
comment "graphic libraries"
+source "package/cegui06/Config.in"
source "package/directfb/Config.in"
source "package/directfb-examples/Config.in"
source "package/divine/Config.in"
diff --git a/package/cegui06/Config.in b/package/cegui06/Config.in
new file mode 100644
index 0000000..54d92ed
--- /dev/null
+++ b/package/cegui06/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_CEGUI06
+ bool "cegui06"
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ select BR2_PACKAGE_EXPAT
+ select BR2_PACKAGE_FREETYPE
+ select BR2_PACKAGE_PCRE
+ help
+ Crazy Eddie's GUI System is a free library providing windowing and
+ widgets for graphics APIs / engines where such functionality is not
+ natively available, or severely lacking. The library is object
+ orientated, written in C++, and targeted at games developers who
+ should be spending their time creating great games, not building
+ GUI sub-systems!
+
+ http://www.cegui.org.uk/
diff --git a/package/cegui06/cegui06-stddef.h.patch b/package/cegui06/cegui06-stddef.h.patch
new file mode 100644
index 0000000..cc16eff
--- /dev/null
+++ b/package/cegui06/cegui06-stddef.h.patch
@@ -0,0 +1,26 @@
+includes: ptrdiff_t is defined in stddef.h
+
+ptrdiff_t is defined in the stddef.h header, so this
+header must be included.
+
+Do the #include in a common header to avoid doing it
+all over the place.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Patch not sent upstream, it's a no-longer-maintained branch.
+To be noted, however, is that the current devel branch is
+still missing that include.
+
+diff -durN cegui06-0.6.2.orig/include/CEGUIBase.h cegui06-0.6.2/include/CEGUIBase.h
+--- cegui06-0.6.2.orig//include/CEGUIBase.h 2008-02-11 15:38:27.000000000 +0100
++++ cegui06-0.6.2/include/CEGUIBase.h 2012-08-19 22:51:50.260385978 +0200
+@@ -34,6 +34,7 @@
+ #define _CEGUIBase_h_
+
+ #include <cassert>
++#include <stddef.h>
+
+ // bring in configuration options
+ #include "CEGUIConfig.h"
diff --git a/package/cegui06/cegui06.mk b/package/cegui06/cegui06.mk
new file mode 100644
index 0000000..817254f
--- /dev/null
+++ b/package/cegui06/cegui06.mk
@@ -0,0 +1,36 @@
+#############################################################
+#
+# libcegui
+#
+#############################################################
+
+# Do not update the version, we need exactly that one for Spice.
+CEGUI06_VERSION_MAJOR = 0.6.2
+CEGUI06_VERSION = $(CEGUI06_VERSION_MAJOR)b
+CEGUI06_SOURCE = CEGUI-$(CEGUI06_VERSION).tar.gz
+CEGUI06_SITE = http://downloads.sourceforge.net/project/crayzedsgui/CEGUI%20Mk-2/$(CEGUI06_VERSION_MAJOR)
+CEGUI06_LICENSE = MIT
+CEGUI06_LICENSE_FILES = COPYING
+CEGUI06_INSTALL_STAGING = YES
+
+CEGUI06_DEPENDENCIES = \
+ expat \
+ freetype \
+ pcre \
+
+CEGUI06_CONF_OPT = \
+ --enable-expat \
+ --disable-external-tinyxml \
+ --disable-xerces-c \
+ --disable-libxml \
+ --disable-tinyxml \
+ --disable-opengl-renderer \
+ --disable-external-glew \
+ --disable-irrlicht-renderer \
+ --disable-directfb-renderer \
+ --disable-samples \
+ --disable-lua-module \
+ --disable-toluacegui \
+ --disable-external-toluapp \
+
+$(eval $(autotools-package))
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 05/20] package/python-pyparsing: new package
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355435224.git.yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 +
package/python-pyparsing/Config.in | 11 +++++++
package/python-pyparsing/python-pyparsing.mk | 38 ++++++++++++++++++++++++++
3 files changed, 50 insertions(+), 0 deletions(-)
create mode 100644 package/python-pyparsing/Config.in
create mode 100644 package/python-pyparsing/python-pyparsing.mk
diff --git a/package/Config.in b/package/Config.in
index 9d68581..d00ebf3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -307,6 +307,7 @@ source "package/python-netifaces/Config.in"
source "package/python-nfc/Config.in"
source "package/python-protobuf/Config.in"
source "package/python-pygame/Config.in"
+source "package/python-pyparsing/Config.in"
source "package/python-serial/Config.in"
source "package/python-setuptools/Config.in"
endmenu
diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in
new file mode 100644
index 0000000..126dd0e
--- /dev/null
+++ b/package/python-pyparsing/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PYTHON_PYPARSING
+ bool "pyparsing"
+ depends on BR2_PACKAGE_PYTHON
+ help
+ The pyparsing module is an alternative approach to creating and
+ executing simple grammars, vs. the traditional lex/yacc approach,
+ or the use of regular expressions. The pyparsing module provides
+ a library of classes that client code uses to construct the grammar
+ directly in Python code.
+
+ http://pyparsing.wikispaces.com/
diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk
new file mode 100644
index 0000000..246df4d
--- /dev/null
+++ b/package/python-pyparsing/python-pyparsing.mk
@@ -0,0 +1,38 @@
+#############################################################
+#
+# python-pyparsing
+#
+#############################################################
+
+PYTHON_PYPARSING_VERSION = 1.5.6
+PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz
+PYTHON_PYPARSING_SITE = http://downloads.sourceforge.net/project/pyparsing/pyparsing/pyparsing-$(PYTHON_PYPARSING_VERSION)
+PYTHON_PYPARSING_LICENSE = MIT
+PYTHON_PYPARSING_LICENSE_FILES = LICENSE
+PYTHON_PYPARSING_INSTALL_STAGING = YES
+PYTHON_PYPARSING_DEPENDENCIES = python
+
+# Shamelessly vampirised from python-pygame ;-)
+define PYTHON_PYPARSING_BUILD_CMDS
+ (cd $(@D); \
+ CC="$(TARGET_CC)" \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ LDSHARED="$(TARGET_CROSS)gcc -shared" \
+ CROSS_COMPILING=yes \
+ _python_sysroot=$(STAGING_DIR) \
+ _python_srcdir=$(BUILD_DIR)/python$(PYTHON_VERSION) \
+ _python_prefix=/usr \
+ _python_exec_prefix=/usr \
+ $(HOST_DIR)/usr/bin/python setup.py build \
+ )
+endef
+
+# Shamelessly vampirised from python-pygame ;-)
+define PYTHON_PYPARSING_INSTALL_TARGET_CMDS
+ (cd $(@D); \
+ $(HOST_DIR)/usr/bin/python setup.py install \
+ --prefix=$(TARGET_DIR)/usr \
+ )
+endef
+
+$(eval $(generic-package))
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 04/20] package/celt051: new package
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355435224.git.yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/multimedia/Config.in | 1 +
package/multimedia/celt051/Config.in | 15 +++++++++++++++
package/multimedia/celt051/celt.mk | 30 ++++++++++++++++++++++++++++++
3 files changed, 46 insertions(+), 0 deletions(-)
create mode 100644 package/multimedia/celt051/Config.in
create mode 100644 package/multimedia/celt051/celt.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 273d9bc..5e8d60c 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -2,6 +2,7 @@ menu "Audio and video applications"
source "package/multimedia/alsa-utils/Config.in"
source "package/multimedia/aumix/Config.in"
source "package/multimedia/bellagio/Config.in"
+source "package/multimedia/celt051/Config.in"
source "package/multimedia/faad2/Config.in"
source "package/multimedia/flac/Config.in"
source "package/multimedia/ffmpeg/Config.in"
diff --git a/package/multimedia/celt051/Config.in b/package/multimedia/celt051/Config.in
new file mode 100644
index 0000000..50ed069
--- /dev/null
+++ b/package/multimedia/celt051/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_CELT051
+ bool "celt051"
+ select BR2_PACKAGE_LIBOGG
+ help
+ The CELT ultra-low delay audio codec
+
+ The CELT codec is a compression algorithm for audio. Like MP3,
+ Vorbis, and AAC it is suitable for transmitting music with high
+ quality. Unlike these formats CELT imposes very little delay on
+ the signal, even less than is typical for speech centric formats
+ like Speex, GSM, or G.729.
+
+ Note: this is version 0.5.1.3 of celt.
+
+ http://www.celt-codec.org/
diff --git a/package/multimedia/celt051/celt.mk b/package/multimedia/celt051/celt.mk
new file mode 100644
index 0000000..9baaa82
--- /dev/null
+++ b/package/multimedia/celt051/celt.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# celt051
+#
+#############################################################
+
+# Although version newer than 0.5.1.3 exists, we're
+# stuck with 0.5.1.3 for use by Spice (coming later)
+CELT051_VERSION = 0.5.1.3
+CELT051_SOURCE = celt-$(CELT051_VERSION).tar.gz
+CELT051_SITE = http://downloads.xiph.org/releases/celt
+CELT051_LICENSE = BSD-2c
+CELT051_LICENSE_FILES = COPYING
+CELT051_INSTALL_STAGING = YES
+CELT051_DEPENDENCIES = libogg
+
+# Need to specify --with-ogg, otherwise /usr/lib may be searched for
+# if target is the same kind as host (ie. same arch, same bitness,
+# same endianness, so that /usr/lib contains libraries linkable by
+# our cross-compiler)
+CELT051_CONF_OPT = \
+ --enable-fixed-point \
+ --disable-fixed-point-debug \
+ --disable-experimental-postfilter \
+ --disable-static-modes \
+ --disable-assertions \
+ --disable-oggtest \
+ --with-ogg=$(STAGING_DIR)/usr \
+
+$(eval $(autotools-package))
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 03/20] package/usbredir: new package
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355435224.git.yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
---
package/Config.in | 1 +
package/usbredir/Config.in | 28 ++++++++++++++++++++++++++++
package/usbredir/usbredir.mk | 31 +++++++++++++++++++++++++++++++
3 files changed, 60 insertions(+), 0 deletions(-)
create mode 100644 package/usbredir/Config.in
create mode 100644 package/usbredir/usbredir.mk
diff --git a/package/Config.in b/package/Config.in
index 8edadf9..9d68581 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -492,6 +492,7 @@ source "package/libupnp/Config.in"
source "package/libvncserver/Config.in"
source "package/nss-mdns/Config.in"
source "package/ortp/Config.in"
+source "package/usbredir/Config.in"
source "package/zeromq/Config.in"
endmenu
diff --git a/package/usbredir/Config.in b/package/usbredir/Config.in
new file mode 100644
index 0000000..8d8ac5a
--- /dev/null
+++ b/package/usbredir/Config.in
@@ -0,0 +1,28 @@
+comment "usbredir requires libusb"
+ depends on !BR2_PACKAGE_LIBUSB
+
+config BR2_PACKAGE_USBREDIR
+ bool "usbredir"
+ depends on BR2_PACKAGE_LIBUSB
+ help
+ usbredir is the name of a network protocol for sending usb device
+ traffic over a network connection. It is also the name of the
+ software package offering a parsing library, a usbredirhost library
+ and several utilities implementing this protocol.
+
+ Note: only the library is installed, not the utilities. Say 'y'
+ below if you want the server too.
+
+ http://www.spice-space.org/page/UsbRedir
+
+if BR2_PACKAGE_USBREDIR
+
+config BR2_PACKAGE_USBREDIR_SERVER
+ bool "usbredirserver on target"
+ help
+ If you want to serve usbredir requests on your target, say 'y'
+ here to have the usbredir server on the target.
+
+ Note: the server is not required to use the library.
+
+endif
diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk
new file mode 100644
index 0000000..70b50c3
--- /dev/null
+++ b/package/usbredir/usbredir.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
+# usbredir
+#
+#############################################################
+
+USBREDIR_VERSION = 0.4.3
+USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.bz2
+USBREDIR_SITE = http://spice-space.org/download/usbredir
+USBREDIR_LICENSE = LGPLv2.1+
+USBREDIR_LICENSE_FILES = COPYING.LIB
+USBREDIR_INSTALL_STAGING = YES
+USBREDIR_DEPENDENCIES = libusb
+
+USBREDIR_DEPENDENCIES += host-pkgconf
+
+ifeq ($(BR2_PACKAGE_USBREDIR_SERVER),y)
+
+USBREDIR_LICENSE += (for the library), GPLv2+ (for the server)
+USBREDIR_LICENSE_FILES += COPYING
+
+else # BR2_PACKAGE_USBREDIR_SERVER != y
+
+define USBREDIR_POST_INSTALL_TARGET_RM_SERVER
+ rm -f $(TARGET_DIR)/usr/sbin/usbredirserver
+endef
+USBREDIR_POST_INSTALL_TARGET_HOOKS += USBREDIR_POST_INSTALL_TARGET_RM_SERVER
+
+endif # BR2_PACKAGE_USBREDIR_SERVER
+
+$(eval $(autotools-package))
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 02/20] package/libiscsi: new package
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355435224.git.yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 +
package/libiscsi/Config.in | 12 ++++++++++++
package/libiscsi/libiscsi.mk | 15 +++++++++++++++
3 files changed, 28 insertions(+), 0 deletions(-)
create mode 100644 package/libiscsi/Config.in
create mode 100644 package/libiscsi/libiscsi.mk
diff --git a/package/Config.in b/package/Config.in
index 2345b4b..8edadf9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -466,6 +466,7 @@ source "package/libesmtp/Config.in"
source "package/libeXosip2/Config.in"
source "package/libfcgi/Config.in"
source "package/libidn/Config.in"
+source "package/libiscsi/Config.in"
source "package/liboauth/Config.in"
source "package/libmicrohttpd/Config.in"
source "package/neon/Config.in"
diff --git a/package/libiscsi/Config.in b/package/libiscsi/Config.in
new file mode 100644
index 0000000..f3fc29e
--- /dev/null
+++ b/package/libiscsi/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBISCSI
+ bool "libiscsi"
+ select BR2_PACKAGE_POPT
+ help
+ Libiscsi is a client-side library to implement the iSCSI protocol
+ that can be used to access resource of an iSCSI Target.
+
+ The library is fully async with regards to iscsi commands and scsi
+ tasks, but a sync layer is also provided for ease of use for simpler
+ applications.
+
+ https://github.com/sahlberg/libiscsi (no proper homepage)
diff --git a/package/libiscsi/libiscsi.mk b/package/libiscsi/libiscsi.mk
new file mode 100644
index 0000000..bfebd7e
--- /dev/null
+++ b/package/libiscsi/libiscsi.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# libiscsi
+#
+#############################################################
+
+LIBISCSI_VERSION = 1.6.0
+LIBISCSI_SOURCE = libiscsi-$(LIBISCSI_VERSION).tar.gz
+LIBISCSI_SITE = https://github.com/downloads/sahlberg/libiscsi
+LIBISCSI_LICENSE = GPLv2+ LGPLv2.1+
+LIBISCSI_LICENSE_FILES = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt
+LIBISCSI_INSTALL_STAGING = YES
+LIBISCSI_DEPENDENCIES = popt
+
+$(eval $(autotools-package))
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 01/20] package/vde2: new package
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355435224.git.yann.morin.1998@free.fr>
VDE is an ethernet compliant virtual network that can be
spawned over a set of physical computer over the Internet.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
---
package/Config.in | 1 +
package/vde2/Config.in | 10 ++++++++++
package/vde2/vde2.mk | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 47 insertions(+), 0 deletions(-)
create mode 100644 package/vde2/Config.in
create mode 100644 package/vde2/vde2.mk
diff --git a/package/Config.in b/package/Config.in
index cad1221..2345b4b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -672,6 +672,7 @@ source "package/ttcp/Config.in"
source "package/udpcast/Config.in"
source "package/ulogd/Config.in"
source "package/ushare/Config.in"
+source "package/vde2/Config.in"
source "package/vpnc/Config.in"
source "package/vsftpd/Config.in"
source "package/vtun/Config.in"
diff --git a/package/vde2/Config.in b/package/vde2/Config.in
new file mode 100644
index 0000000..f344d67
--- /dev/null
+++ b/package/vde2/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_VDE2
+ bool "vde2"
+ help
+ VDE is an ethernet compliant virtual network that can be
+ spawned over a set of physical computers over the Internet.
+ VDE is part of the virtualsquare project.
+
+ http://vde.sourceforge.net/
+
+ Note: only the libraries are installed.
diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk
new file mode 100644
index 0000000..062835e
--- /dev/null
+++ b/package/vde2/vde2.mk
@@ -0,0 +1,36 @@
+#############################################################
+#
+# vde2
+#
+#############################################################
+
+VDE2_VERSION = 2.3.2
+VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2
+VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION)
+VDE2_LICENSE = GPLv2+ LGPLv2.1+ BSD-3c
+VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde
+VDE2_INSTALL_STAGING = YES
+
+# Reasons for enabling/disabling stuff:
+#?- tuntap is enabled in the hope we're using a recent-enough toolchain
+# that does have if_tun.h (virtually everything these days)
+# - kvde_switch is disabled because it requires a patched kernel
+# - cryptcab is disabled to not depend on openSSL
+# - python is disabled to not depend on Python
+# - pcap is disabled to not depend on libpcap
+# - profiling is disabled because we do not want to debug/profile
+#
+# Note: disabled features can be added with corresponding dependencies
+# in future commits.
+VDE2_CONF_OPT = --disable-experimental \
+ --disable-cryptcab \
+ --disable-pcap \
+ --disable-python \
+ --disable-profile \
+ --disable-kernel-switch \
+ --enable-tuntap \
+
+#?Package does not build in parallel due to improper make rules
+VDE2_MAKE = $(MAKE1)
+
+$(eval $(autotools-package))
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [pull request] Pull request for branch yem-new-packages
From: Yann E. MORIN @ 2012-12-13 21:47 UTC (permalink / raw)
To: buildroot
Hello All!
This patch series is an extract from my qemu-related big-ish series,
that I did split up to ease regview / integration upstream.
This part of the series is unrelated to the previously-sent series
yem-host-qemu-fixes.
This series deals with adding the required packages to build QEMU on
the target.
The following changes since commit e043dd6c99a801dc7f863986c78c947e25c75b3f:
barebox: bump to version 2012.12.1 (2012-12-13 09:37:10 +0100)
are available in the git repository at:
git://gitorious.org/buildroot/buildroot.git yem-new-packages
Yann E. MORIN (20):
package/vde2: new package
package/libiscsi: new package
package/usbredir: new package
package/celt051: new package
package/python-pyparsing: new package
package/cegui06: new package
package/slirp: new package
package/spice-protocol: new package
package/spice: new package
package/spice: enable client
package/spice: enable GUI
package/spice: enable slirp support
package/libseccomp: new package
package/keyutils: new package
package/pmake: add host pmake
package/libbsd: new package
package/libedit2: new package
package/ceph: new package
package/dtc: new package
package/dtc: add option to install programs
package/Config.in | 14 +
package/cegui06/Config.in | 15 +
package/cegui06/cegui06-stddef.h.patch | 26 +
package/cegui06/cegui06.mk | 36 +
package/ceph/Config.in | 18 +
package/ceph/ceph-no-envz.patch | 63 +
package/ceph/ceph-no-getloadavg.patch | 61 +
package/ceph/ceph-no-posix_fallocate.patch | 50 +
package/ceph/ceph.mk | 53 +
package/dtc/Config.in | 29 +
package/dtc/dtc-extra_cflags.patch | 27 +
package/dtc/dtc-separate-lib-install.patch | 28 +
package/dtc/dtc.mk | 51 +
package/keyutils/Config.in | 7 +
.../keyutils-01-memleak-from-realloc.patch | 51 +
package/keyutils/keyutils-02-another-memleak.patch | 32 +
package/keyutils/keyutils-03-cifs.patch | 15 +
.../keyutils-04-Makefile-for-buildroot.patch | 65 +
.../keyutils/keyutils-05-fix-install-rule.patch | 19 +
package/keyutils/keyutils.mk | 32 +
package/libbsd/Config.in | 10 +
package/libbsd/libbsd.mk | 21 +
package/libedit2/Config.in | 9 +
package/libedit2/libedit2-01-Makefile.patch | 25 +
package/libedit2/libedit2-02-el.c-issetugid.patch | 24 +
package/libedit2/libedit2-03-el.c-MAXPATHLEN.patch | 40 +
.../libedit2/libedit2-04-readline.h-stdio.patch | 17 +
.../libedit2/libedit2-08-readline-history.h.patch | 20 +
.../libedit2/libedit2-10-define_SIZE_T_MAX.patch | 18 +
.../libedit2/libedit2-12-libedit-Makefile.patch | 54 +
package/libedit2/libedit2-20-fortify.patch | 23 +
package/libedit2/libedit2.mk | 75 +
package/libedit2/libedit2.pc | 13 +
package/libiscsi/Config.in | 12 +
package/libiscsi/libiscsi.mk | 15 +
package/libseccomp/Config.in | 13 +
...ibseccomp-use-system-headers-from-sysroot.patch | 17 +
package/libseccomp/libseccomp.mk | 22 +
package/multimedia/Config.in | 1 +
package/multimedia/celt051/Config.in | 15 +
package/multimedia/celt051/celt.mk | 30 +
package/pmake/pmake-100_mk.patch | 2624 ++++++++++++++++++++
package/pmake/pmake-110_mkdep.patch | 230 ++
package/pmake/pmake-120_fixes.patch | 266 ++
package/pmake/pmake-130_maxpathlen.patch | 39 +
package/pmake/pmake-140_multiarch.patch | 354 +++
package/pmake/pmake-150_mktemp.patch | 31 +
package/pmake/pmake.mk | 46 +
package/python-pyparsing/Config.in | 11 +
package/python-pyparsing/python-pyparsing.mk | 38 +
package/slirp/Config.in | 25 +
package/slirp/slirp.mk | 21 +
package/spice-protocol/Config.in | 12 +
package/spice-protocol/spice-protocol.mk | 14 +
package/spice/Config.in | 51 +
package/spice/spice.mk | 80 +
package/usbredir/Config.in | 28 +
package/usbredir/usbredir.mk | 31 +
package/vde2/Config.in | 10 +
package/vde2/vde2.mk | 36 +
60 files changed, 5113 insertions(+), 0 deletions(-)
create mode 100644 package/cegui06/Config.in
create mode 100644 package/cegui06/cegui06-stddef.h.patch
create mode 100644 package/cegui06/cegui06.mk
create mode 100644 package/ceph/Config.in
create mode 100644 package/ceph/ceph-no-envz.patch
create mode 100644 package/ceph/ceph-no-getloadavg.patch
create mode 100644 package/ceph/ceph-no-posix_fallocate.patch
create mode 100644 package/ceph/ceph.mk
create mode 100644 package/dtc/Config.in
create mode 100644 package/dtc/dtc-extra_cflags.patch
create mode 100644 package/dtc/dtc-separate-lib-install.patch
create mode 100644 package/dtc/dtc.mk
create mode 100644 package/keyutils/Config.in
create mode 100644 package/keyutils/keyutils-01-memleak-from-realloc.patch
create mode 100644 package/keyutils/keyutils-02-another-memleak.patch
create mode 100644 package/keyutils/keyutils-03-cifs.patch
create mode 100644 package/keyutils/keyutils-04-Makefile-for-buildroot.patch
create mode 100644 package/keyutils/keyutils-05-fix-install-rule.patch
create mode 100644 package/keyutils/keyutils.mk
create mode 100644 package/libbsd/Config.in
create mode 100644 package/libbsd/libbsd.mk
create mode 100644 package/libedit2/Config.in
create mode 100644 package/libedit2/libedit2-01-Makefile.patch
create mode 100644 package/libedit2/libedit2-02-el.c-issetugid.patch
create mode 100644 package/libedit2/libedit2-03-el.c-MAXPATHLEN.patch
create mode 100644 package/libedit2/libedit2-04-readline.h-stdio.patch
create mode 100644 package/libedit2/libedit2-08-readline-history.h.patch
create mode 100644 package/libedit2/libedit2-10-define_SIZE_T_MAX.patch
create mode 100644 package/libedit2/libedit2-12-libedit-Makefile.patch
create mode 100644 package/libedit2/libedit2-20-fortify.patch
create mode 100644 package/libedit2/libedit2.mk
create mode 100644 package/libedit2/libedit2.pc
create mode 100644 package/libiscsi/Config.in
create mode 100644 package/libiscsi/libiscsi.mk
create mode 100644 package/libseccomp/Config.in
create mode 100644 package/libseccomp/libseccomp-use-system-headers-from-sysroot.patch
create mode 100644 package/libseccomp/libseccomp.mk
create mode 100644 package/multimedia/celt051/Config.in
create mode 100644 package/multimedia/celt051/celt.mk
create mode 100644 package/pmake/pmake-100_mk.patch
create mode 100644 package/pmake/pmake-110_mkdep.patch
create mode 100644 package/pmake/pmake-120_fixes.patch
create mode 100644 package/pmake/pmake-130_maxpathlen.patch
create mode 100644 package/pmake/pmake-140_multiarch.patch
create mode 100644 package/pmake/pmake-150_mktemp.patch
create mode 100644 package/pmake/pmake.mk
create mode 100644 package/python-pyparsing/Config.in
create mode 100644 package/python-pyparsing/python-pyparsing.mk
create mode 100644 package/slirp/Config.in
create mode 100644 package/slirp/slirp.mk
create mode 100644 package/spice-protocol/Config.in
create mode 100644 package/spice-protocol/spice-protocol.mk
create mode 100644 package/spice/Config.in
create mode 100644 package/spice/spice.mk
create mode 100644 package/usbredir/Config.in
create mode 100644 package/usbredir/usbredir.mk
create mode 100644 package/vde2/Config.in
create mode 100644 package/vde2/vde2.mk
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] builroot-2012.11.tar.bz2: CVS control directory left in toolchain/elf2flt/elf2flt
From: Thierry Bultel @ 2012-12-13 21:45 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87lid1ljw4.fsf@dell.be.48ers.dk>
Le 13/12/2012 22:30, Peter Korsgaard a ?crit :
>>>>>> "Thierry" == Thierry Bultel <thierry.bultel@wanadoo.fr> writes:
>
> Thierry> FYI
> Thierry> Thierry
>
> Yes, that's on purpose. Elf2flt doesn't have releases, so the easiest
> way of working with it is from an existing CVS checkout, atleast that
> was how it was back when it was added in 2006.
>
> Now, it hasn't really been updated in buildroot since then, so I doubt
> people are really using it - Perhaps we should deprecate it?
>
Actually I am not using it either.
The CVS dir came in conflict with my versioning system and that is how I
noticed it.
^ permalink raw reply
* [Buildroot] [PATCH 4/4] package/qemu: bump version
From: Yann E. MORIN @ 2012-12-13 21:39 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355434710.git.yann.morin.1998@free.fr>
Bump QEMU to 1.2.1.
Note: 1.3.0 is out now, but ./configure has changed a bit, and there are
new dependencies, so the bump to 1.3.0 is postponed for a litle while...
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Francois Perrad <fperrad@gmail.com>
---
package/qemu/qemu.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 91d0eb8..241a392 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -4,7 +4,7 @@
#
#############################################################
-QEMU_VERSION = 1.2.0
+QEMU_VERSION = 1.2.1
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
QEMU_SITE = http://wiki.qemu.org/download
QEMU_LICENSE = GPLv2 LGPLv2.1 MIT BSD-3c BSD-2c Others/BSD-1c
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 3/4] package/qemu: use autotools-package infrastructure
From: Yann E. MORIN @ 2012-12-13 21:39 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355434710.git.yann.morin.1998@free.fr>
Turns out that, with a little bit of tweaking, we can use
the autotools-package infrastructure to build QEMU.
That's better than defining all the _CMDS and using the
generic-package infra.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Francois Perrad <fperrad@gmail.com>
---
package/qemu/qemu.mk | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 2c0dbde..91d0eb8 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -62,6 +62,9 @@ ifeq ($(HOST_QEMU_ARCH),powerpc)
endif
HOST_QEMU_TARGETS=$(HOST_QEMU_ARCH)-linux-user
+# Note: although QEMU has a ./configure script, it is not a real autotools
+# package, and ./configure chokes on options such as --host or --target.
+# So, provide out own _CONFIGURE_CMDS to override the defaults.
define HOST_QEMU_CONFIGURE_CMDS
(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure \
--target-list="$(HOST_QEMU_TARGETS)" \
@@ -74,19 +77,7 @@ define HOST_QEMU_CONFIGURE_CMDS
)
endef
-define HOST_QEMU_BUILD_CMDS
- $(MAKE) -C $(@D) all
-endef
-
-define HOST_QEMU_INSTALL_CMDS
- $(MAKE) -C $(@D) install
-endef
-
-define HOST_QEMU_CLEAN_CMDS
- $(MAKE) -C $(@D) clean
-endef
-
-$(eval $(host-generic-package))
+$(eval $(host-autotools-package))
# variable used by other packages
QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(QEMU_ARCH)
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 2/4] package/qemu: fix host dependencies
From: Yann E. MORIN @ 2012-12-13 21:39 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355434710.git.yann.morin.1998@free.fr>
'host-*' packages should depends on other 'host-*' packages,
not on target packages.
Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Francois Perrad <fperrad@gmail.com>
---
package/qemu/qemu.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 81cd79f..2c0dbde 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -16,7 +16,7 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB
#-------------------------------------------------------------
# Host-qemu
-HOST_QEMU_DEPENDENCIES = host-pkgconf zlib libglib2
+HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2
# BR ARCH qemu
# ------- ----
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 1/4] package/qemu: fix host-qemu variable names
From: Yann E. MORIN @ 2012-12-13 21:39 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355434710.git.yann.morin.1998@free.fr>
With the upcoming introduction of qemu-on-target, we need to properly
separate the variables used for the host qemu, from the variables
used for the target qemu.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Francois Perrad <fperrad@gmail.com>
---
package/qemu/qemu.mk | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 790d34f..81cd79f 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -13,7 +13,10 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB
# the non-(L)GPL license texts are specified in the affected
# individual source files.
-QEMU_DEPENDENCIES = host-pkgconf zlib libglib2
+#-------------------------------------------------------------
+# Host-qemu
+
+HOST_QEMU_DEPENDENCIES = host-pkgconf zlib libglib2
# BR ARCH qemu
# ------- ----
@@ -44,20 +47,20 @@ QEMU_DEPENDENCIES = host-pkgconf zlib libglib2
# sh64 not supported
# sparc sparc
-QEMU_ARCH = $(ARCH)
-ifeq ($(QEMU_ARCH),i486)
- QEMU_ARCH = i386
+HOST_QEMU_ARCH = $(ARCH)
+ifeq ($(HOST_QEMU_ARCH),i486)
+ HOST_QEMU_ARCH = i386
endif
-ifeq ($(QEMU_ARCH),i586)
- QEMU_ARCH = i386
+ifeq ($(HOST_QEMU_ARCH),i586)
+ HOST_QEMU_ARCH = i386
endif
-ifeq ($(QEMU_ARCH),i686)
- QEMU_ARCH = i386
+ifeq ($(HOST_QEMU_ARCH),i686)
+ HOST_QEMU_ARCH = i386
endif
-ifeq ($(QEMU_ARCH),powerpc)
- QEMU_ARCH = ppc
+ifeq ($(HOST_QEMU_ARCH),powerpc)
+ HOST_QEMU_ARCH = ppc
endif
-HOST_QEMU_TARGETS=$(QEMU_ARCH)-linux-user
+HOST_QEMU_TARGETS=$(HOST_QEMU_ARCH)-linux-user
define HOST_QEMU_CONFIGURE_CMDS
(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure \
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [pull request] Pull request for branch yem-host-qemu-fixes
From: Yann E. MORIN @ 2012-12-13 21:39 UTC (permalink / raw)
To: buildroot
Hello All!
This short series is an extract from my larger qemu-related series.
I did split it up to ease review and integration.
The following changes since commit e043dd6c99a801dc7f863986c78c947e25c75b3f:
barebox: bump to version 2012.12.1 (2012-12-13 09:37:10 +0100)
are available in the git repository at:
git://gitorious.org/buildroot/buildroot.git yem-host-qemu-fixes
Yann E. MORIN (4):
package/qemu: fix host-qemu variable names
package/qemu: fix host dependencies
package/qemu: use autotools-package infrastructure
package/qemu: bump version
package/qemu/qemu.mk | 44 +++++++++++++++++++-------------------------
1 files changed, 19 insertions(+), 25 deletions(-)
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] Getting It into Compact Flash
From: Arnout Vandecappelle @ 2012-12-13 21:37 UTC (permalink / raw)
To: buildroot
In-Reply-To: <000901cdd883$889a6e70$99cf4b50$@co.uk>
On 12/12/12 17:12, Ted Wood wrote:
> OK Next question:
>
> I?ve built a kernel image and a file system image.
>
> I?ve manually installed Grub 2 and a grub.cfg file which looks like this:
>
> menuentry ?Buildroot?
>
> {
>
> set root=?(hd0,msdos1)?
>
> echo ?Loading Kernel?)
>
> linux /boot/bzimage
>
> echo ?Loading Root FS?
>
> initrd /boot/rootfs.ext2
>
> }
For an initrd, you should use a cpio filesystem rather than ext2:
- ext2 adds overhead that is completely unnecessary for a ramdisk;
- if you use anything else than static device management, the devtmps
will not be mounted automatically by the kernel; the cpio filesystem
adds a /init script that mounts it for you.
I thought this was now clearly explained in the manual, is it not?
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply
* [Buildroot] builroot-2012.11.tar.bz2: CVS control directory left in toolchain/elf2flt/elf2flt
From: Peter Korsgaard @ 2012-12-13 21:30 UTC (permalink / raw)
To: buildroot
In-Reply-To: <50CA3F70.2060900@wanadoo.fr>
>>>>> "Thierry" == Thierry Bultel <thierry.bultel@wanadoo.fr> writes:
Thierry> FYI
Thierry> Thierry
Yes, that's on purpose. Elf2flt doesn't have releases, so the easiest
way of working with it is from an existing CVS checkout, atleast that
was how it was back when it was added in 2006.
Now, it hasn't really been updated in buildroot since then, so I doubt
people are really using it - Perhaps we should deprecate it?
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [v2] luajit: complete replacement for lua
From: Arnout Vandecappelle @ 2012-12-13 21:21 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1354783499-20000-1-git-send-email-francois.perrad@gadz.org>
Hi Francois,
On 06/12/12 09:44, Francois Perrad wrote:
> the mutual exclusion is done by a choice
>
> Signed-off-by: Francois Perrad<francois.perrad@gadz.org>
>
> see initial discussion, http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/43499
>
> ---
> Makefile | 6 ++++++
> package/Config.in | 1 -
> package/copas/copas.mk | 2 +-
> package/coxpcall/coxpcall.mk | 1 -
> package/lua-msgpack-native/lua-msgpack-native.mk | 2 +-
> package/lua/Config.in | 25 ++++++++++++++++++++++
> package/luacjson/luacjson.mk | 2 +-
> package/luaexpat/luaexpat.mk | 2 +-
> package/luafilesystem/luafilesystem.mk | 2 +-
> package/luajit/Config.in | 12 -----------
> package/luajit/luajit-05-install-like-lua.patch | 17 +++++++++++++++
> package/luasocket/luasocket.mk | 2 +-
> package/rings/rings.mk | 2 +-
> package/xavante/xavante.mk | 2 +-
> 14 files changed, 56 insertions(+), 22 deletions(-)
> delete mode 100644 package/luajit/Config.in
> create mode 100644 package/luajit/luajit-05-install-like-lua.patch
>
> diff --git a/Makefile b/Makefile
> index 4b09437..b5215e0 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -282,6 +282,12 @@ HOSTCC := $(CCACHE) $(HOSTCC)
> HOSTCXX := $(CCACHE) $(HOSTCXX)
> endif
>
> +ifeq ($(BR2_PACKAGE_LUA),y)
> + LUA_INTERPRETER = lua
> +else ifeq ($(BR2_PACKAGE_LUAJIT),y)
> + LUA_INTERPRETER = luajit
> +endif
> +
Minor detail: I think this fits better in package/Makefile.in.
> #############################################################
> #
> # You should probably leave this stuff alone unless you know
> diff --git a/package/Config.in b/package/Config.in
> index 74e439e..e6e294e 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -271,7 +271,6 @@ source "package/erlang/Config.in"
> source "package/haserl/Config.in"
> source "package/jamvm/Config.in"
> source "package/lua/Config.in"
> -source "package/luajit/Config.in"
> if BR2_PACKAGE_LUA || BR2_PACKAGE_LUAJIT
> menu "LUA libraries/modules"
> source "package/cgilua/Config.in"
> diff --git a/package/copas/copas.mk b/package/copas/copas.mk
> index c84a6cc..a258927 100644
> --- a/package/copas/copas.mk
> +++ b/package/copas/copas.mk
> @@ -6,7 +6,7 @@
>
> COPAS_VERSION = 1.1.6
> COPAS_SITE = http://github.com/downloads/keplerproject/copas
> -COPAS_DEPENDENCIES = lua coxpcall luasocket
> +COPAS_DEPENDENCIES = coxpcall luasocket
I guess this is removed because it's a runtime-only dependency?
Then it's better to do this in a separate patch.
[snip]
> diff --git a/package/lua/Config.in b/package/lua/Config.in
> index 4166730..d698a25 100644
> --- a/package/lua/Config.in
> +++ b/package/lua/Config.in
> @@ -1,3 +1,13 @@
> +
> +choice
> + prompt "Lua Interpreter"
> + default BR2_PACKAGE_LUA_NONE
> +
> +config BR2_PACKAGE_LUA_NONE
> + bool "none"
> + help
> + None.
> +
> config BR2_PACKAGE_LUA
> bool "lua"
> help
> @@ -5,6 +15,21 @@ config BR2_PACKAGE_LUA
>
> http://www.lua.org/
>
> +config BR2_PACKAGE_LUAJIT
> + bool "luajit"
> + # Luajit is only available for some target architectures, and
> + # has some complexity wrt 32/64. See luajit.mk for details.
> + depends on BR2_i386 || (BR2_x86_64&& BR2_HOSTARCH='x86_64') || BR2_powerpc || BR2_arm || BR2_armeb
> + help
> + LuaJIT implements the full set of language features defined
> + by Lua 5.1. The virtual machine (VM) is API- and
> + ABI-compatible to the standard Lua interpreter and can be
> + deployed as a drop-in replacement.
> +
> + http://luajit.org/
> +
> +endchoice
It's a good idea to make it a choice, but I have a few problems
with it:
- it doesn't work well with packages that select LUA (e.g.
BR2_PACKAGE_LIGHTTPD_LUA);
- it's not good to split luajit's Config.in from the .mk file.
Maybe there could be a symbol BR2_USE_LUA that can be selected by
other packages? This symbol could be defined package/Config.in.
The choice would default to BR2_PACKAGE_LUA if BR2_USE_LUA, and
BR2_PACKAGE_LUA_NONE would depend on !BR2_USE_LUA.
> +
> if BR2_PACKAGE_LUA
>
> choice
[snip]
> diff --git a/package/xavante/xavante.mk b/package/xavante/xavante.mk
> index 0c1c6f1..7f49f4d 100644
> --- a/package/xavante/xavante.mk
> +++ b/package/xavante/xavante.mk
> @@ -6,7 +6,7 @@
>
> XAVANTE_VERSION = 2.2.1
> XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante
> -XAVANTE_DEPENDENCIES = cgilua copas coxpcall lua luafilesystem luasocket wsapi
> +XAVANTE_DEPENDENCIES = cgilua copas coxpcall luafilesystem luasocket wsapi
Here again I think it should be a separate patch.
Regards,
Arnout
> XAVANTE_LICENSE = MIT
>
> define XAVANTE_INSTALL_TARGET_CMDS
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply
* [Buildroot] Boost builds failed
From: Arnout Vandecappelle @ 2012-12-13 21:07 UTC (permalink / raw)
To: buildroot
In-Reply-To: <673DDE2D-005B-43FD-A21B-B84568013166@gmail.com>
On 13/12/12 11:40, Victor Hiairrassary wrote:
> During some auto builds, boost failed to compiles because on .config file, only boost is selected, and no boost library is selected, like thread regex,etc.
I don't think the issue is that no library is selected; rather, it looks
like something breaks down in uClibc builds...
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ 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