* [Buildroot] [PATCH] qwt: new package
From: Arnout Vandecappelle @ 2012-12-17 6:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <877goifgwv.fsf@dell.be.48ers.dk>
On 16/12/12 11:08, Peter Korsgaard wrote:
> Samuel> +define QWT_CLEAN_CMDS
> Samuel> + -$(MAKE) -C $(@D) clean
> Samuel> + -rm $(TARGET_DIR)/usr/lib/libqwt.so.*
>
> If we cannot clean completely (E.G. everything else installed into
> staging), then I prefer just not providing a clean target.
Begging to differ: I think it does make sense to have clean commands
but no uninstall commands. Of course, the definition above should have
been split up into a clean and an uninstall.
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] [PATCH] package/libseccomp: works only on x86
From: Peter Korsgaard @ 2012-12-17 6:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355698594-25590-1-git-send-email-yann.morin.1998@free.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
Yann> As it is, the libseccomp code explicitly checks for x86 (32- or 64-bit),
Yann> so it can't work on other architectures.
Committed, thanks.
It seems we'll need the same for spice:
http://autobuild.buildroot.net/results/36fbda99bcddbce8b66c87ae5ee8d4f9105bd296/build-end.log
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] package/libseccomp: works only on x86
From: Peter Korsgaard @ 2012-12-17 6:25 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=3472e094a18147ab8deefbb8dd47d07c041cc222
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
As it is, the libseccomp code explicitly checks for x86 (32- or 64-bit),
so it can't work on other architectures.
Reported-by: Peter Korsgaard <jacmet@uclibc.org>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/libseccomp/Config.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/libseccomp/Config.in b/package/libseccomp/Config.in
index 1e524d2..9ee1697 100644
--- a/package/libseccomp/Config.in
+++ b/package/libseccomp/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_LIBSECCOMP
bool "libseccomp"
+ depends on BR2_i386 || BR2_x86_64
help
High level interface to the Linux Kernel's seccomp filter
^ permalink raw reply related
* [Buildroot] [PATCH 26/27] package/qemu: enable a static build
From: Yann E. MORIN @ 2012-12-16 23:22 UTC (permalink / raw)
To: buildroot
In-Reply-To: <2fc3655574313a23489d70e1d777c710866b63b7.1355677144.git.yann.morin.1998@free.fr>
All,
On Sunday 16 December 2012 Yann E. MORIN wrote:
[--SNIP--]
> diff --git a/package/qemu/Config.in b/package/qemu/Config.in
> index 435775a..f88a1f4 100644
> --- a/package/qemu/Config.in
> +++ b/package/qemu/Config.in
[--SNIP--]
> @@ -238,6 +244,24 @@ config BR2_PACKAGE_QEMU_SOUND_SDL
>
> Note: this is only for system emulation, not user emulation.
>
> +<<<<<<< HEAD
> +=======
Bummer. Fixed.
> +# 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
> +
> +>>>>>>> dd73234... package/qemu: enable a static build
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] netatalk : Fix BerkeleyDB library path
From: Maxime Hadjinlian @ 2012-12-16 23:15 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87pq29bq11.fsf@dell.be.48ers.dk>
On Sun, Dec 16, 2012 at 11:17 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "Maxime" == Maxime Hadjinlian <maxime.hadjinlian@gmail.com> writes:
>
> Maxime> This fix is needed for the 64bits build because Netatalk will assume the library
> Maxime> are stored in [..]/lib64/ instead of [..]/lib/
>
> Hmm, we still seem to have issues on the autobuilders:
>
> http://autobuild.buildroot.net/results/cf5c3ce94c229204bfa0f19b1009c13a9bcc1dfc/build-end.log
>
> Maxime> +++ b/package/netatalk/netatalk.mk
> Maxime> @@ -8,7 +8,7 @@ NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NET
> Maxime> NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
>
> Maxime> NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error
> Maxime> -NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99"
> Maxime> +NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" BDB_LIB=$(STAGING_LIB)/usr/lib
>
>
> I guess you meant STAGING_DIR instead here, will fix.
This is strange because I tested with a 64 bits build and I had'nt the
problem anymore.. And I don't remember rewriting the patch before
sending it here. But then again, you're totally right, this does'nt
make sense. I'm really wondering how it could have worked for me :/
>
> --
> Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] package/libseccomp: works only on x86
From: Yann E. MORIN @ 2012-12-16 22:56 UTC (permalink / raw)
To: buildroot
As it is, the libseccomp code explicitly checks for x86 (32- or 64-bit),
so it can't work on other architectures.
Reported-by: Peter Korsgaard <jacmet@uclibc.org>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/libseccomp/Config.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/libseccomp/Config.in b/package/libseccomp/Config.in
index 1e524d2..9ee1697 100644
--- a/package/libseccomp/Config.in
+++ b/package/libseccomp/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_LIBSECCOMP
bool "libseccomp"
+ depends on BR2_i386 || BR2_x86_64
help
High level interface to the Linux Kernel's seccomp filter
--
1.7.2.5
^ permalink raw reply related
* [Buildroot] [PATCH 12/19] package/libseccomp: new package
From: Peter Korsgaard @ 2012-12-16 22:19 UTC (permalink / raw)
To: buildroot
In-Reply-To: <caac6f2b10b2b3a3d473e552c106e9e748243cf9.1355676845.git.yann.morin.1998@free.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
Yann> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Yann> ---
Yann> package/Config.in | 1 +
Yann> package/libseccomp/Config.in | 13 +++++++++++
Yann> ...ibseccomp-use-system-headers-from-sysroot.patch | 17 +++++++++++++++
Yann> package/libseccomp/libseccomp.mk | 22 ++++++++++++++++++++
There seem to be some arch dependent issues on atleast powerpc:
http://autobuild.buildroot.net/results/1742dfc07c27cfa91e1b253a2b16142206413b6b/build-end.log
Care to have a look?
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] netatalk: fix STAGING_DIR typo
From: Peter Korsgaard @ 2012-12-16 22:17 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=bdafee20a64492daa4d6dc4f3aaf4516c53e12ba
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/netatalk/netatalk.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index 23c2a95..46355ce 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -8,7 +8,7 @@ NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NET
NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error
-NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" BDB_LIB=$(STAGING_LIB)/usr/lib
+NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" BDB_LIB=$(STAGING_DIR)/usr/lib
NETATALK_CONF_OPT += --with-cnid-cdb-backend \
--with-bdb=$(STAGING_DIR)/usr \
--disable-zeroconf \
^ permalink raw reply related
* [Buildroot] [PATCH] netatalk : Fix BerkeleyDB library path
From: Peter Korsgaard @ 2012-12-16 22:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1354981988-32415-1-git-send-email-maxime.hadjinlian@gmail.com>
>>>>> "Maxime" == Maxime Hadjinlian <maxime.hadjinlian@gmail.com> writes:
Maxime> This fix is needed for the 64bits build because Netatalk will assume the library
Maxime> are stored in [..]/lib64/ instead of [..]/lib/
Hmm, we still seem to have issues on the autobuilders:
http://autobuild.buildroot.net/results/cf5c3ce94c229204bfa0f19b1009c13a9bcc1dfc/build-end.log
Maxime> +++ b/package/netatalk/netatalk.mk
Maxime> @@ -8,7 +8,7 @@ NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NET
Maxime> NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
Maxime> NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error
Maxime> -NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99"
Maxime> +NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" BDB_LIB=$(STAGING_LIB)/usr/lib
I guess you meant STAGING_DIR instead here, will fix.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 12/19] package/libseccomp: new package
From: Yann E. MORIN @ 2012-12-16 20:42 UTC (permalink / raw)
To: buildroot
In-Reply-To: <871uepd968.fsf@dell.be.48ers.dk>
Peter, All,
On Sunday 16 December 2012 Peter Korsgaard wrote:
> >>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
[--SNIP--]
> Yann> diff --git a/package/libseccomp/Config.in b/package/libseccomp/Config.in
> Yann> new file mode 100644
> Yann> index 0000000..183cf4e
> Yann> --- /dev/null
> Yann> +++ b/package/libseccomp/Config.in
> Yann> @@ -0,0 +1,13 @@
> Yann> +config BR2_PACKAGE_LIBSECCOMP
> Yann> + bool "libseccomp"
> Yann> + help
> Yann> + High level interface to the Linux Kernel's seccomp filter
> Yann> +
> Yann> + The libseccomp library provides and easy to use, platform independent,
>
> s/and/an/. I know this is just cut'n'pasted from the sf.net website, but
> I've fixed it anyway and committed, thanks.
Thank you!
Regards,
Yamnn 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 13/19] package/keyutils: new package
From: Peter Korsgaard @ 2012-12-16 20:39 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1280f35f9f32881fd0158fd3cfda65e83fc953ce.1355676845.git.yann.morin.1998@free.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
Yann> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Yann> Cc: Jarkko Sakkinen <jarkko.sakkinen@iki.fi>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] package/keyutils: new package
From: Peter Korsgaard @ 2012-12-16 20:39 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=90934a3de8364038b05d33b8145fd6d506809a64
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Jarkko Sakkinen <jarkko.sakkinen@iki.fi>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
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(-)
diff --git a/package/Config.in b/package/Config.in
index 1b8c5b3..d6af55d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -741,6 +741,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))
^ permalink raw reply related
* [Buildroot] [PATCH 12/19] package/libseccomp: new package
From: Peter Korsgaard @ 2012-12-16 20:38 UTC (permalink / raw)
To: buildroot
In-Reply-To: <caac6f2b10b2b3a3d473e552c106e9e748243cf9.1355676845.git.yann.morin.1998@free.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
Yann> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Yann> ---
Yann> package/Config.in | 1 +
Yann> package/libseccomp/Config.in | 13 +++++++++++
Yann> ...ibseccomp-use-system-headers-from-sysroot.patch | 17 +++++++++++++++
Yann> package/libseccomp/libseccomp.mk | 22 ++++++++++++++++++++
Yann> 4 files changed, 53 insertions(+), 0 deletions(-)
Yann> create mode 100644 package/libseccomp/Config.in
Yann> create mode 100644 package/libseccomp/libseccomp-use-system-headers-from-sysroot.patch
Yann> create mode 100644 package/libseccomp/libseccomp.mk
Yann> diff --git a/package/Config.in b/package/Config.in
Yann> index eff2887..2f67d10 100644
Yann> --- a/package/Config.in
Yann> +++ b/package/Config.in
Yann> @@ -523,6 +523,7 @@ source "package/libical/Config.in"
Yann> source "package/libnspr/Config.in"
Yann> source "package/libsigc/Config.in"
Yann> source "package/libtpl/Config.in"
Yann> +source "package/libseccomp/Config.in"
Yann> source "package/liburcu/Config.in"
Yann> source "package/linux-pam/Config.in"
Yann> source "package/lttng-libust/Config.in"
Yann> diff --git a/package/libseccomp/Config.in b/package/libseccomp/Config.in
Yann> new file mode 100644
Yann> index 0000000..183cf4e
Yann> --- /dev/null
Yann> +++ b/package/libseccomp/Config.in
Yann> @@ -0,0 +1,13 @@
Yann> +config BR2_PACKAGE_LIBSECCOMP
Yann> + bool "libseccomp"
Yann> + help
Yann> + High level interface to the Linux Kernel's seccomp filter
Yann> +
Yann> + The libseccomp library provides and easy to use, platform independent,
s/and/an/. I know this is just cut'n'pasted from the sf.net website, but
I've fixed it anyway and committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] package/libseccomp: new package
From: Peter Korsgaard @ 2012-12-16 20:37 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=fd303038febaf7008a1f04262dc5decb32d1cfab
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: fix typo in help text]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/Config.in | 1 +
package/libseccomp/Config.in | 13 +++++++++++
| 17 +++++++++++++++
package/libseccomp/libseccomp.mk | 22 ++++++++++++++++++++
4 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index d3f5e80..1b8c5b3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -524,6 +524,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..1e524d2
--- /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 an 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))
^ permalink raw reply related
* [Buildroot] [PATCH 11/19] package/spice: enable slirp support
From: Peter Korsgaard @ 2012-12-16 20:35 UTC (permalink / raw)
To: buildroot
In-Reply-To: <0d0efc7aeef44df9f9f7af9cb27d9ca293ab2359.1355676845.git.yann.morin.1998@free.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
Yann> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] package/spice: enable slirp support
From: Peter Korsgaard @ 2012-12-16 20:35 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=5faf337b39a0515439b828c5ad12858fa9c02b38
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
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
^ permalink raw reply related
* [Buildroot] [PATCH 10/19] package/spice: enable GUI
From: Peter Korsgaard @ 2012-12-16 20:35 UTC (permalink / raw)
To: buildroot
In-Reply-To: <a4e69702d8a9283387ebc0ac27e283f5fd5942a0.1355676845.git.yann.morin.1998@free.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
Yann> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] package/spice: enable GUI
From: Peter Korsgaard @ 2012-12-16 20:35 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=af103acf4eb7fa6193c0bb9d844ea95f4e15db71
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
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
^ permalink raw reply related
* [Buildroot] [PATCH 09/19] package/spice: enable client
From: Peter Korsgaard @ 2012-12-16 20:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <0be08def92b0e0aee8dab2f9fbea788dcbd7ea28.1355676845.git.yann.morin.1998@free.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
Yann> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] package/spice: enable client
From: Peter Korsgaard @ 2012-12-16 20:34 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=a872142c2f25761cbcfe024d4b9f0072f2639cea
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
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
^ permalink raw reply related
* [Buildroot] [PATCH 08/19] package/spice: new package
From: Peter Korsgaard @ 2012-12-16 20:33 UTC (permalink / raw)
To: buildroot
In-Reply-To: <d6bc42bdcd101e0e5855e55e6ae3ab950d456c00.1355676845.git.yann.morin.1998@free.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
Yann> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] package/spice: new package
From: Peter Korsgaard @ 2012-12-16 20:33 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=93d4e38450639aef401adfcc2c4e412efaef3da9
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/Config.in | 1 +
package/spice/Config.in | 23 +++++++++++++++++
package/spice/spice.mk | 62 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 86 insertions(+), 0 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index 3de0140..d3f5e80 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -666,6 +666,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))
^ permalink raw reply related
* [Buildroot] [PATCH 07/19] package/spice-protocol: new package
From: Peter Korsgaard @ 2012-12-16 20:31 UTC (permalink / raw)
To: buildroot
In-Reply-To: <917eafc46dcd545a08e6f9695fa5b3b48fdc99e4.1355676845.git.yann.morin.1998@free.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
Yann> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Yann> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Yann> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Yann> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] package/spice-protocol: new package
From: Peter Korsgaard @ 2012-12-16 20:31 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=31d41cdefa4869fdd544dd9812c6f1902b72caab
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/Config.in | 1 +
package/spice-protocol/Config.in | 12 ++++++++++++
package/spice-protocol/spice-protocol.mk | 14 ++++++++++++++
3 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index eaf42e3..3de0140 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -665,6 +665,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))
^ permalink raw reply related
* [Buildroot] [PATCH 06/19] package/slirp: new package
From: Peter Korsgaard @ 2012-12-16 20:30 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4bcf84fd448ee60b9b5381196889ffc7311e43d6.1355676845.git.yann.morin.1998@free.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
Yann> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Yann> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ 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