[Buildroot] [PATCH 00/33] Pull request for 2012.11/bug-fixes

[Buildroot] [PATCH 00/33] Pull request for 2012.11/bug-fixes

[Samuel Martin]

Hi all,

Here is a bug fixes series which targets the 2012.11 released.

Series detail:
- Patches 1 to 16 are random package fixes (help text/source urls/build fixes);
- Patch 17 is linux-fusion package update, which fix directfb build;
- Patch 18 is a python security update;
- Patch 19 is an improvement for the download infrastructure;
- Patch 20 enables rrdtool python bindings;
- Patch 21-33 add license info to most of the packages touched by this series.

IMO, patches 1 to 18 can be integrated for the 2012.11 release.

Patch 19 is more open to be discussed, somehow making echo to what has been
said during the lastest BR dev days.

Patch 20 can be merged in the next branch.


Yours,


Samuel Martin (33):
  libecore: fix build with glibc >=2.16
  libpcap: add pcap.pc file
  tcpdump: use 'pkg-config pcap' instead of pcap-config
  igh-ethercat: disable drivers build with kernel 3.6
  imagemagick: explicitly disable c++ support if no c++ compiler
    available
  sylpheed: fix build disabling gpgme support
  fluxbox: fix build against imlib2
  owl-linux: update help text about linux kernel dependencies.
  linux-fusion: fix build
  ltp-testsuite: add warning about bessel function support if uclibc
    toolchain
  ltp-testsuite: fix build on uClibc exp10
  sconeserver: fix configure.in
  sconeserver: fix imagemagick dependency
  dependencies: build a host python2 if no suitable one can be found
  scons: force to use python2 on the host
  libmad: do not install mad.pc on the target
  matchbox packages: fix broken urls
  linux-fusion: bump to version 8.10.4
  python2: bump to 2.7.3
  pkg-download.mk: add tarball check in the wget method
  rrdtool: add python binding support
  libmad: add license info
  scons: add license info
  efl packages: add license info
  fluxbox: add license info
  igh-ethercat: add license info
  imagemagick: add license info
  imlib2: add license info
  ltp-testsuite: add license info
  matchbox packages: add license info
  owl-linux: add license info
  rrdtool: add license info
  sylpheed: add license info

 package/efl/expedite/expedite.mk                   |  3 +
 ...ecore-ecore_exe-fix-build-with-glibc-2-16.patch | 94 ++++++++++++++++++++++
 package/efl/libecore/libecore.mk                   |  3 +
 package/efl/libedbus/libedbus.mk                   |  3 +
 package/efl/libedje/libedje.mk                     |  3 +
 package/efl/libeet/libeet.mk                       |  3 +
 package/efl/libefreet/libefreet.mk                 |  3 +
 package/efl/libeina/libeina.mk                     |  3 +
 package/efl/libelementary/libelementary.mk         |  3 +
 package/efl/libembryo/libembryo.mk                 |  3 +
 package/efl/libethumb/libethumb.mk                 |  3 +
 package/efl/libevas/libevas.mk                     |  3 +
 package/fluxbox/fluxbox-fix-configure.patch        | 19 +++++
 package/fluxbox/fluxbox.mk                         |  8 +-
 package/igh-ethercat/Config.in                     |  7 +-
 package/igh-ethercat/igh-ethercat.mk               |  4 +
 package/imagemagick/imagemagick.mk                 |  9 +++
 package/imlib2/imlib2.mk                           |  4 +-
 package/libmad/libmad.mk                           |  8 +-
 package/libpcap/libpcap.mk                         | 10 +++
 package/libpcap/pcap.pc                            | 12 +++
 .../linux-fusion/linux-fusion-fix-include.patch    | 43 ++++++++++
 package/linux-fusion/linux-fusion.mk               |  2 +-
 package/ltp-testsuite/Config.in                    |  4 +
 ...tsuite-20101031-fix-build-on-uClibc-exp10.patch | 22 +++++
 package/ltp-testsuite/ltp-testsuite.mk             |  2 +
 .../matchbox/matchbox-common/matchbox-common.mk    |  9 ++-
 .../matchbox/matchbox-desktop/matchbox-desktop.mk  |  8 +-
 .../matchbox/matchbox-fakekey/matchbox-fakekey.mk  |  3 +
 .../matchbox-keyboard/matchbox-keyboard.mk         |  5 +-
 package/matchbox/matchbox-lib/matchbox-lib.mk      |  5 +-
 package/matchbox/matchbox-panel/matchbox-panel.mk  |  9 ++-
 .../matchbox-startup-monitor.mk                    |  3 +
 package/matchbox/matchbox-wm/matchbox-wm.mk        |  5 +-
 package/owl-linux/Config.in                        |  2 +
 package/owl-linux/owl-linux.mk                     |  2 +
 package/pkg-download.mk                            | 13 ++-
 package/python/python-2.7-009-python-symlink.patch | 25 ------
 .../python-2.7-100-optional-test-modules.patch     |  3 +-
 package/python/python-2.7-101-optional-pydoc.patch |  3 +-
 package/python/python-2.7-102-optional-2to3.patch  | 12 +--
 .../python/python-2.7-103-optional-sqlite.patch    | 31 ++++++-
 package/python/python-2.7-104-optional-tk.patch    |  3 +-
 .../python/python-2.7-105-optional-curses.patch    |  3 +-
 package/python/python-2.7-106-optional-expat.patch |  3 +-
 package/python/python-2.7-110-optional-db.patch    |  7 +-
 package/python/python.mk                           |  2 +-
 package/rrdtool/Config.in                          |  8 ++
 package/rrdtool/rrdtool-fix-python-includes.patch  | 29 +++++++
 package/rrdtool/rrdtool.mk                         | 22 ++++-
 package/sconeserver/Config.in                      |  3 +
 ...-dependency-use-pkg-config-instead-of-Mag.patch | 41 ++++++++++
 ...n-do-not-hardcode-mysql-include-directory.patch | 27 +++++++
 package/sconeserver/sconeserver.mk                 |  4 +-
 package/scons/scons.mk                             |  8 +-
 package/sylpheed/sylpheed.mk                       |  4 +-
 ...ump-use-pkg-config-instead-of-pcap-config.patch | 68 ++++++++++++++++
 package/tcpdump/tcpdump.mk                         |  3 +-
 support/dependencies/check-host-python2.mk         |  6 ++
 support/dependencies/check-host-python2.sh         | 13 +++
 support/dependencies/dependencies.sh               |  2 +-
 61 files changed, 599 insertions(+), 76 deletions(-)
 create mode 100644 package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch
 create mode 100644 package/fluxbox/fluxbox-fix-configure.patch
 create mode 100644 package/libpcap/pcap.pc
 create mode 100644 package/linux-fusion/linux-fusion-fix-include.patch
 create mode 100644 package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch
 delete mode 100644 package/python/python-2.7-009-python-symlink.patch
 create mode 100644 package/rrdtool/rrdtool-fix-python-includes.patch
 create mode 100644 package/sconeserver/sconeserver-180-ImageMagick-dependency-use-pkg-config-instead-of-Mag.patch
 create mode 100644 package/sconeserver/sconeserver-180-configure.in-do-not-hardcode-mysql-include-directory.patch
 create mode 100644 package/tcpdump/tcpdump-use-pkg-config-instead-of-pcap-config.patch
 create mode 100644 support/dependencies/check-host-python2.mk
 create mode 100755 support/dependencies/check-host-python2.sh

--
1.8.0

[Buildroot] [PATCH 01/33] libecore: fix build with glibc >=2.16

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 ...ecore-ecore_exe-fix-build-with-glibc-2-16.patch | 94 ++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch

diff --git a/package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch b/package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch
new file mode 100644
index 0000000..d9b439c
--- /dev/null
+++ b/package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch
@@ -0,0 +1,94 @@
+Backported for commit a0df6712b6afcd07facd32e5a66809170277bdf3
+Fixed the ChangeLog part.
+
+This patch fix build with glibc >=2.16, avoiding the following error occurs:
+
+Making all in ecore
+make[6]: Entering directory `/opt/buildroot/output/build/host-libecore-1.1.0/src/lib/ecore'
+  CC     ecore.lo
+  CC     ecore_anim.lo
+  CC     ecore_app.lo
+  CC     ecore_events.lo
+  CC     ecore_getopt.lo
+  CC     ecore_idle_enterer.lo
+  CC     ecore_idle_exiter.lo
+  CC     ecore_idler.lo
+  CC     ecore_job.lo
+  CC     ecore_main.lo
+  CC     ecore_pipe.lo
+  CC     ecore_poll.lo
+  CC     ecore_time.lo
+  CC     ecore_timer.lo
+  CC     ecore_thread.lo
+  CC     ecore_glib.lo
+  CC     ecore_throttle.lo
+  CC     ecore_signal.lo
+  CC     ecore_exe.lo
+ecore_exe.c: In function ?ecore_exe_pipe_run?:
+ecore_exe.c:486:15: warning: implicit declaration of function ?setpriority? [-Wimplicit-function-declaration]
+ecore_exe.c:486:27: error ?PRIO_PROCESS? undeclared (first use in this function)
+ecore_exe.c:486:27: note: each undeclared identifier is reported only once for each function it appears in
+make[6]: *** [ecore_exe.lo] Error 1
+
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+From a0df6712b6afcd07facd32e5a66809170277bdf3 Mon Sep 17 00:00:00 2001
+From: caro <caro>
+Date: Fri, 22 Jun 2012 05:36:00 +0000
+Subject: [PATCH] ecore_exe: fix compilation on fedora 18.
+
+setpriority needs sys/resource.h. See:
+
+http://linux.die.net/man/2/setpriority
+
+I let sys/time.h, it does not hurt on linux and is anyway needed for BSD systems.
+
+
+git-svn-id: http://svn.enlightenment.org/svn/e at 72684 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
+---
+ ChangeLog                 | 4 ++++
+ src/lib/ecore/ecore_exe.c | 7 ++-----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index a306f75..549ad19 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -763,3 +763,7 @@
+ 2011-11-29 Mike McCormack
+
+ 	* Allow quitting before entering the glib version of the main loop
++
++2012-06-22 Vincent Torri
++
++	* ecore_exe: fix compilation on fedora 18.
+diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
+index 7931a96..6db32a9 100644
+--- a/src/lib/ecore/ecore_exe.c
++++ b/src/lib/ecore/ecore_exe.c
+@@ -2,11 +2,6 @@
+ # include <config.h>
+ #endif
+ 
+-#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
+-# include <sys/time.h>
+-# include <sys/resource.h>
+-#endif
+-
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -14,6 +9,8 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <sys/time.h>
++#include <sys/resource.h>
+ 
+ #ifdef HAVE_SYS_PRCTL_H
+ # include <sys/prctl.h>
+-- 
+1.7.12.2
+
-- 
1.8.0

[Buildroot] [PATCH 01/33] libecore: fix build with glibc >=2.16

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 02/33] libpcap: add pcap.pc file

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/libpcap/libpcap.mk | 10 ++++++++++
 package/libpcap/pcap.pc    | 12 ++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 package/libpcap/pcap.pc

diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 7a1d32f..d813b85 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -26,4 +26,14 @@ ifeq ($(BR2_microblaze),y)
 LIBPCAP_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC"
 endif
 
+LIBPCAP_USB_SUPPORT = $(if $(BR2_PACKAGE_LIBUSB),-lusb-1.0)
+define LIBPCAP_INSTALL_STAGING_PC
+	sed -e 's/@LIBPCAP_VERSION@/$(LIBPCAP_VERSION)/' \
+		-e 's/@LIBPCAP_USB_SUPPORT@/$(LIBPCAP_USB_SUPPORT)/' \
+		< package/libpcap/pcap.pc \
+		> $(STAGING_DIR)/usr/lib/pkgconfig/pcap.pc
+endef
+
+LIBPCAP_POST_INSTALL_STAGING_HOOKS += LIBPCAP_INSTALL_STAGING_PC
+
 $(eval $(autotools-package))
diff --git a/package/libpcap/pcap.pc b/package/libpcap/pcap.pc
new file mode 100644
index 0000000..0bd1917
--- /dev/null
+++ b/package/libpcap/pcap.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: pcap
+Description: System-independent library for user-level network packet capture
+Requires:
+Version: @LIBPCAP_VERSION@
+Libs: -L${libdir} -lpcap
+Libs.private: @LIBPCAP_USB_SUPPORT@ -lpthread
+Cflags: -I${includedir}
-- 
1.8.0

[Buildroot] [PATCH 02/33] libpcap: add pcap.pc file

[Thomas Petazzoni]

Dear Samuel Martin,

On Thu, 22 Nov 2012 01:17:52 +0100, Samuel Martin wrote:
> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
>  package/libpcap/libpcap.mk | 10 ++++++++++
>  package/libpcap/pcap.pc    | 12 ++++++++++++
>  2 files changed, 22 insertions(+)
>  create mode 100644 package/libpcap/pcap.pc

I don't remember if I asked the question already or not, but anyway:
has this pcap.pc been pushed upstream?

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 02/33] libpcap: add pcap.pc file

[Samuel Martin]

2012/11/22 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:
> Dear Samuel Martin,
>
> On Thu, 22 Nov 2012 01:17:52 +0100, Samuel Martin wrote:
>>
>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> ---
>>  package/libpcap/libpcap.mk | 10 ++++++++++
>>  package/libpcap/pcap.pc    | 12 ++++++++++++
>>  2 files changed, 22 insertions(+)
>>  create mode 100644 package/libpcap/pcap.pc
>
> I don't remember if I asked the question already or not, but anyway:
> has this pcap.pc been pushed upstream?

Not yet, I'll do it.

Regards,

-- 
Sam

[Buildroot] [PATCH 03/33] tcpdump: use 'pkg-config pcap' instead of pcap-config

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 ...ump-use-pkg-config-instead-of-pcap-config.patch | 68 ++++++++++++++++++++++
 package/tcpdump/tcpdump.mk                         |  3 +-
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 package/tcpdump/tcpdump-use-pkg-config-instead-of-pcap-config.patch

diff --git a/package/tcpdump/tcpdump-use-pkg-config-instead-of-pcap-config.patch b/package/tcpdump/tcpdump-use-pkg-config-instead-of-pcap-config.patch
new file mode 100644
index 0000000..bd12580
--- /dev/null
+++ b/package/tcpdump/tcpdump-use-pkg-config-instead-of-pcap-config.patch
@@ -0,0 +1,68 @@
+Use 'pkg-config pcap' instead of the pcap-config binary which does not
+correctly support cross-compilation.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+--- tcpdump-4.3.0.orig/aclocal.m4	2012-11-17 14:04:17.159100154 +0100
++++ tcpdump-4.3.0/aclocal.m4	2012-11-17 15:28:46.319808067 +0100
+@@ -287,29 +287,13 @@ AC_DEFUN(AC_LBL_LIBPCAP,
+     AC_MSG_CHECKING(for local pcap library)
+     libpcap=FAIL
+     lastdir=FAIL
+-    places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
+-	egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'`
+-    for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do
+-	    basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//' | \
+-	        sed -e 's/-PRE-GIT$//' `
+-	    if test $lastdir = $basedir ; then
+-		    dnl skip alphas when an actual release is present
+-		    continue;
+-	    fi
+-	    lastdir=$dir
+-	    if test -r $dir/libpcap.a ; then
+-		    libpcap=$dir/libpcap.a
+-		    d=$dir
+-		    dnl continue and select the last one that exists
+-	    fi
+-    done
+     if test $libpcap = FAIL ; then
+ 	    AC_MSG_RESULT(not found)
+ 
+ 	    #
+ 	    # Look for pcap-config.
+ 	    #
+-	    AC_PATH_TOOL(PCAP_CONFIG, pcap-config)
++	    AC_PATH_TOOL(PCAP_CONFIG, pkg-config)
+ 	    if test -n "$PCAP_CONFIG" ; then
+ 		#
+ 		# Found - use it to get the include flags for
+@@ -322,9 +322,9 @@ AC_DEFUN(AC_LBL_LIBPCAP,
+ 		# double-quoted strings inside double-quoted back-quoted
+ 		# expressions (pfew!)."
+ 		#
+-		cflags=`"$PCAP_CONFIG" --cflags`
++		cflags=`"$PCAP_CONFIG" pcap --cflags`
+ 		$2="$cflags $$2"
+-		libpcap=`"$PCAP_CONFIG" --libs`
++		libpcap=`"$PCAP_CONFIG" pcap --libs`
+ 	    else
+ 		#
+ 		# Not found; look for pcap.
+@@ -380,7 +380,7 @@ AC_DEFUN(AC_LBL_LIBPCAP,
+                     AC_MSG_ERROR(cannot find pcap.h, see INSTALL)
+  	    fi
+ 	    AC_MSG_RESULT($libpcap)
+-	    AC_PATH_PROG(PCAP_CONFIG, pcap-config,, $d)
++	    AC_PATH_PROG(PCAP_CONFIG, pkg-config,, $d)
+ 	    if test -n "$PCAP_CONFIG"; then
+ 		#
+ 		# The libpcap directory has a pcap-config script.
+@@ -395,7 +395,7 @@ AC_DEFUN(AC_LBL_LIBPCAP,
+ 		# double-quoted strings inside double-quoted back-quoted
+ 		# expressions (pfew!)."
+ 		#
+-		additional_libs=`"$PCAP_CONFIG" --additional-libs --static`
++		additional_libs=`"$PCAP_CONFIG" pcap --libs --static`
+ 		libpcap="$libpcap $additional_libs"
+ 	    fi
+     fi
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index 96414ef..72def58 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -11,10 +11,11 @@ TCPDUMP_SITE = http://www.tcpdump.org/release
 TCPDUMP_LICENSE = BSD-3c
 TCPDUMP_LICENSE_FILES = LICENSE
 
+TCPDUMP_AUTORECONF = YES
 TCPDUMP_CONF_ENV = ac_cv_linux_vers=2 td_cv_buggygetaddrinfo=no
 TCPDUMP_CONF_OPT = --without-crypto \
 		$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
-TCPDUMP_DEPENDENCIES = zlib libpcap
+TCPDUMP_DEPENDENCIES = host-pkgconf zlib libpcap
 
 # make install installs an unneeded extra copy of the tcpdump binary
 define TCPDUMP_REMOVE_DUPLICATED_BINARY
-- 
1.8.0

[Buildroot] [PATCH 03/33] tcpdump: use 'pkg-config pcap' instead of pcap-config

[Thomas Petazzoni]

Dear Samuel Martin,

On Thu, 22 Nov 2012 01:17:53 +0100, Samuel Martin wrote:

> +-	    AC_PATH_TOOL(PCAP_CONFIG, pcap-config)
> ++	    AC_PATH_TOOL(PCAP_CONFIG, pkg-config)

This is not generally how pkg-config is used. In general, people use
the PKG_CHECK_MODULES() autoconf macro.

Has this been pushed upstream? I guess you need to make it smarter
like: start testing with pkg-config, then fallback to pcap-config, in
order to make this suitable for upstream.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 03/33] tcpdump: use 'pkg-config pcap' instead of pcap-config

[Samuel Martin]

Hi Thomas,

2012/11/22 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:
> Dear Samuel Martin,
>
> On Thu, 22 Nov 2012 01:17:53 +0100, Samuel Martin wrote:
>
>> +-        AC_PATH_TOOL(PCAP_CONFIG, pcap-config)
>> ++        AC_PATH_TOOL(PCAP_CONFIG, pkg-config)
>
> This is not generally how pkg-config is used. In general, people use
> the PKG_CHECK_MODULES() autoconf macro.
>
> Has this been pushed upstream?
I've not tried to push this patch upstream yet.

> I guess you need to make it smarter
> like: start testing with pkg-config, then fallback to pcap-config, in
> order to make this suitable for upstream.
I agree.
The truth is I'm not so confident with autotools, so any enlightment is welcome.


Regards,


-- 
Sam

[Buildroot] [PATCH 04/33] igh-ethercat: disable drivers build with kernel 3.6

[Samuel Martin]

Since hardware specific support is available for some given kernel
releases (mostly for kernel <=3.2), then disable them if kernel 3.6 is
enable. However, this still allows the generic driver build.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/igh-ethercat/Config.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/igh-ethercat/Config.in b/package/igh-ethercat/Config.in
index 890bb12..4a0fd75 100644
--- a/package/igh-ethercat/Config.in
+++ b/package/igh-ethercat/Config.in
@@ -6,7 +6,12 @@ config BR2_PACKAGE_IGH_ETHERCAT
 
 	  http://www.etherlab.org/en/ethercat/index.php
 
-if BR2_PACKAGE_IGH_ETHERCAT
+if BR2_PACKAGE_IGH_ETHERCAT && !BR2_LINUX_KERNEL_3_6
+
+comment "The following drivers are only available for some"
+comment "releases of the kernel (mostly 2.6.x)."
+comment "Further details about the kernel/hardware support at:"
+comment "http://www.etherlab.org/en/ethercat/hardware.php"
 
 config BR2_PACKAGE_IGH_ETHERCAT_8139TOO
 	bool "8139too driver"
-- 
1.8.0

[Buildroot] [PATCH 04/33] igh-ethercat: disable drivers build with kernel 3.6

[Thomas Petazzoni]

Dear Samuel Martin,

On Thu, 22 Nov 2012 01:17:54 +0100, Samuel Martin wrote:
> Since hardware specific support is available for some given kernel
> releases (mostly for kernel <=3.2), then disable them if kernel 3.6 is
> enable. However, this still allows the generic driver build.
> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
>  package/igh-ethercat/Config.in | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/package/igh-ethercat/Config.in b/package/igh-ethercat/Config.in
> index 890bb12..4a0fd75 100644
> --- a/package/igh-ethercat/Config.in
> +++ b/package/igh-ethercat/Config.in
> @@ -6,7 +6,12 @@ config BR2_PACKAGE_IGH_ETHERCAT
>  
>  	  http://www.etherlab.org/en/ethercat/index.php
>  
> -if BR2_PACKAGE_IGH_ETHERCAT
> +if BR2_PACKAGE_IGH_ETHERCAT && !BR2_LINUX_KERNEL_3_6
> +
> +comment "The following drivers are only available for some"
> +comment "releases of the kernel (mostly 2.6.x)."
> +comment "Further details about the kernel/hardware support at:"
> +comment "http://www.etherlab.org/en/ethercat/hardware.php"

I'm sorry but I don't quite understand neither the commit log nor the
comment here. Could you explain a bit more? Is this fixing any sort of
build problem?

Also !BR2_LINUX_KERNEL_3_6 works only if the user isn't using a custom
Git tree or something like that.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 04/33] igh-ethercat: disable drivers build with kernel 3.6

[Samuel Martin]

2012/11/22 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:
> Dear Samuel Martin,
>
> On Thu, 22 Nov 2012 01:17:54 +0100, Samuel Martin wrote:
>> Since hardware specific support is available for some given kernel
>> releases (mostly for kernel <=3.2), then disable them if kernel 3.6 is
>> enable. However, this still allows the generic driver build.
>>
>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> ---
>>  package/igh-ethercat/Config.in | 7 ++++++-
>>  1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/package/igh-ethercat/Config.in b/package/igh-ethercat/Config.in
>> index 890bb12..4a0fd75 100644
>> --- a/package/igh-ethercat/Config.in
>> +++ b/package/igh-ethercat/Config.in
>> @@ -6,7 +6,12 @@ config BR2_PACKAGE_IGH_ETHERCAT
>>
>>         http://www.etherlab.org/en/ethercat/index.php
>>
>> -if BR2_PACKAGE_IGH_ETHERCAT
>> +if BR2_PACKAGE_IGH_ETHERCAT && !BR2_LINUX_KERNEL_3_6
>> +
>> +comment "The following drivers are only available for some"
>> +comment "releases of the kernel (mostly 2.6.x)."
>> +comment "Further details about the kernel/hardware support at:"
>> +comment "http://www.etherlab.org/en/ethercat/hardware.php"
>
> I'm sorry but I don't quite understand neither the commit log nor the
> comment here. Could you explain a bit more? Is this fixing any sort of
> build problem?
You are right, it's not so clear... so lemme try to rephrase this:

igh-ethercat porvides some drivers for some specific kernel releases.

At configure time, we pass the kernel build directory.

igh-ethercat somehow finds the kernel version, then try to match it
among the available driver sources.

Here is what looks like the source tree:
z$ (cd output/build/igh-ethercat-1.5.1/ ; find devices/e1000e/ | sort
| head -n20)
devices/e1000e/
devices/e1000e/82571-2.6.32-ethercat.c
devices/e1000e/82571-2.6.32-orig.c
devices/e1000e/82571-2.6.33-ethercat.c
devices/e1000e/82571-2.6.33-orig.c
devices/e1000e/82571-2.6.34-ethercat.c
devices/e1000e/82571-2.6.34-orig.c
devices/e1000e/82571-2.6.35-ethercat.c
devices/e1000e/82571-2.6.35-orig.c
devices/e1000e/82571-2.6.37-ethercat.c
devices/e1000e/82571-2.6.37-orig.c
devices/e1000e/defines-2.6.32-ethercat.h
devices/e1000e/defines-2.6.32-orig.h
devices/e1000e/defines-2.6.33-ethercat.h
devices/e1000e/defines-2.6.33-orig.h
devices/e1000e/defines-2.6.34-ethercat.h
devices/e1000e/defines-2.6.34-orig.h
devices/e1000e/defines-2.6.35-ethercat.h
devices/e1000e/defines-2.6.35-orig.h
devices/e1000e/defines-2.6.37-ethercat.h

So whatever is your kernel release, it should match one of the
supported release listed at:
http://www.etherlab.org/en/ethercat/hardware.php

Otherwise, it fails :-/

Hope, it's clearer.
If you have any suggestion about how to rephrase both the help text
and/or the commit message,
please, share them.


Regards,


-- 
Sam

[Buildroot] [PATCH 05/33] imagemagick: explicitly disable c++ support if no c++ compiler available

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/imagemagick/imagemagick.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 61a379d..365a073 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -35,6 +35,12 @@ IMAGEMAGICK_CONF_OPT = --program-transform-name='s,,,' \
 
 IMAGEMAGICK_DEPENDENCIES = host-pkgconf
 
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+IMAGEMAGICK_CONF_OPT = --with-magick-plus-plus
+else
+IMAGEMAGICK_CONF_OPT = --without-magick-plus-plus
+endif
+
 ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
 IMAGEMAGICK_CONF_OPT += --with-fontconfig
 IMAGEMAGICK_DEPENDENCIES += fontconfig
-- 
1.8.0

[Buildroot] [PATCH 05/33] imagemagick: explicitly disable c++ support if no c++ compiler available

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 Samuel> ---
 Samuel>  package/imagemagick/imagemagick.mk | 6 ++++++
 Samuel>  1 file changed, 6 insertions(+)

 Samuel> diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
 Samuel> index 61a379d..365a073 100644
 Samuel> --- a/package/imagemagick/imagemagick.mk
 Samuel> +++ b/package/imagemagick/imagemagick.mk
 Samuel> @@ -35,6 +35,12 @@ IMAGEMAGICK_CONF_OPT = --program-transform-name='s,,,' \
 
 Samuel>  IMAGEMAGICK_DEPENDENCIES = host-pkgconf
 
 Samuel> +ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
 Samuel> +IMAGEMAGICK_CONF_OPT = --with-magick-plus-plus
 Samuel> +else
 Samuel> +IMAGEMAGICK_CONF_OPT = --without-magick-plus-plus
 Samuel> +endif

Why? We set TARGET_CXX to 'false' if we don't have C++ support, and the
configure script seems to handle it OK. I just did a quick test build
with a minimal config:

BR2_arm=y
BR2_arm926t=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_PATH="/opt/br/arm926t/usr"
# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
BR2_PACKAGE_IMAGEMAGICK=y

And I see the imagemagick configure script saying:

Magick++          --with-magick-plus-plus=yes	no (failed tests)

(and the build doesn't fail)

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 06/33] sylpheed: fix build disabling gpgme support

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/sylpheed/sylpheed.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index cf55c90..3ac2e1e 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -9,7 +9,7 @@ SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR)
 SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
 SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
 
-SYLPHEED_CONF_OPT = --disable-gtkspell
+SYLPHEED_CONF_OPT = --disable-gtkspell --disable-gpgme
 
 SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2
 
-- 
1.8.0

[Buildroot] [PATCH 06/33] sylpheed: fix build disabling gpgme support

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 Samuel> ---
 Samuel>  package/sylpheed/sylpheed.mk | 2 +-
 Samuel>  1 file changed, 1 insertion(+), 1 deletion(-)

 Samuel> diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
 Samuel> index cf55c90..3ac2e1e 100644
 Samuel> --- a/package/sylpheed/sylpheed.mk
 Samuel> +++ b/package/sylpheed/sylpheed.mk
 Samuel> @@ -9,7 +9,7 @@ SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR)
 Samuel>  SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
 Samuel>  SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
 
 Samuel> -SYLPHEED_CONF_OPT = --disable-gtkspell
 Samuel> +SYLPHEED_CONF_OPT = --disable-gtkspell --disable-gpgme

Why? Does it pick up libgpgme from the host?

It would be good if you could write a bit more detailed commit messages.

 
 Samuel>  SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2
 
 Samuel> -- 
 Samuel> 1.8.0

 Samuel> _______________________________________________
 Samuel> buildroot mailing list
 Samuel> buildroot at busybox.net
 Samuel> http://lists.busybox.net/mailman/listinfo/buildroot


-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 06/33] sylpheed: fix build disabling gpgme support

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <jacmet@uclibc.org> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 Samuel> ---
 Samuel> package/sylpheed/sylpheed.mk | 2 +-
 Samuel> 1 file changed, 1 insertion(+), 1 deletion(-)

 Samuel> diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
 Samuel> index cf55c90..3ac2e1e 100644
 Samuel> --- a/package/sylpheed/sylpheed.mk
 Samuel> +++ b/package/sylpheed/sylpheed.mk
 Samuel> @@ -9,7 +9,7 @@ SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR)
 Samuel> SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
 Samuel> SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
 
 Samuel> -SYLPHEED_CONF_OPT = --disable-gtkspell
 Samuel> +SYLPHEED_CONF_OPT = --disable-gtkspell --disable-gpgme

 Peter> Why? Does it pick up libgpgme from the host?

 Peter> It would be good if you could write a bit more detailed commit
 Peter> messages.

Samuel, I don't think you ever replied to this. Can the patch be dropped
or is it still needed?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 06/33] sylpheed: fix build disabling gpgme support

[Samuel Martin]

Hi Peter, all,

2013/5/6 Peter Korsgaard <jacmet@sunsite.dk>:
>>>>>> "Peter" == Peter Korsgaard <jacmet@uclibc.org> writes:
>
>  Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
[...]>  Samuel> -SYLPHEED_CONF_OPT = --disable-gtkspell
>  Samuel> +SYLPHEED_CONF_OPT = --disable-gtkspell --disable-gpgme
>
>  Peter> Why? Does it pick up libgpgme from the host?
iirc, it does, but i'm not sure.

>
>  Peter> It would be good if you could write a bit more detailed commit
>  Peter> messages.
>
> Samuel, I don't think you ever replied to this. Can the patch be dropped
> or is it still needed?
Right. You can drop it for now.

If i trigger the problem again, I'll resend it.
Also, iirc, someone posted some patch about libgpgme, but i haven't
tried it yet.

Regards,

-- 
Samuel

[Buildroot] [PATCH 07/33] fluxbox: fix build against imlib2

[Samuel Martin]

* fix missing dependency
* set imlib2 prefix at configure time
* fix configure script to take account of the imlib2 prefix if any

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/fluxbox/fluxbox-fix-configure.patch | 19 +++++++++++++++++++
 package/fluxbox/fluxbox.mk                  |  7 ++++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 package/fluxbox/fluxbox-fix-configure.patch

diff --git a/package/fluxbox/fluxbox-fix-configure.patch b/package/fluxbox/fluxbox-fix-configure.patch
new file mode 100644
index 0000000..a739f08
--- /dev/null
+++ b/package/fluxbox/fluxbox-fix-configure.patch
@@ -0,0 +1,19 @@
+Avoid to call the imlib2-config that may be installed on the host system
+(even when --with-imlib2-prefix or  --with-imlib2-exec-prefix is passed to
+the configure script), which totally screws up the resulting linker flags.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+--- fluxbox-1.3.2.orig/configure.in	2012-10-21 16:11:59.445749396 +0200
++++ fluxbox-1.3.2/configure.in	2012-10-21 16:35:27.658390856 +0200
+@@ -443,8 +443,8 @@ if test x$enable_imlib2 = "xyes"; then
+       [
+          IMLIB2=true
+          AC_DEFINE(HAVE_IMLIB2, [], [Imlib2 support])
+-         IMLIB2_LIBS=`imlib2-config --libs`
+-         IMLIB2_CFLAGS=`imlib2-config --cflags`
++         IMLIB2_LIBS=`$IMLIB2_CONFIG --libs`
++         IMLIB2_CFLAGS=`$IMLIB2_CONFIG --cflags`
+          LIBS="$LIBS $IMLIB2_LIBS"
+          CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS"
+        ], [ AC_MSG_RESULT(no)]
diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
index 15136c9..bb34379 100644
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -7,11 +7,12 @@
 FLUXBOX_VERSION = 1.3.2
 FLUXBOX_SOURCE = fluxbox-$(FLUXBOX_VERSION).tar.bz2
 FLUXBOX_SITE = http://downloads.sourceforge.net/project/fluxbox/fluxbox/$(FLUXBOX_VERSION)
-
+FLUXBOX_AUTORECONF = YES
 FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
-		   --x-libraries=$(STAGING_DIR)/usr/lib
+		   --x-libraries=$(STAGING_DIR)/usr/lib \
+		   --with-imlib2-prefix=$(STAGING_DIR)/usr
 
-FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+FLUXBOX_DEPENDENCIES = imlib2 xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 define FLUXBOX_INSTALL_XSESSION_FILE
 	[ -f $(TARGET_DIR)/root/.xsession ] || $(INSTALL) -m 0755 -D \
-- 
1.8.0

[Buildroot] [PATCH 07/33] fluxbox: fix build against imlib2

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> * fix missing dependency
 Samuel> * set imlib2 prefix at configure time
 Samuel> * fix configure script to take account of the imlib2 prefix if any

Ehh, fluxbox doesn't select imlib2 in it's Config.in and it looks like
it's an optional dependency:

From configure.in:

dnl Check whether to use imlib2
IMLIB2=false
AC_MSG_CHECKING([whether to have Imlib2 (pixmap themes) support])
AC_ARG_ENABLE(imlib2,
    AC_HELP_STRING([--enable-imlib2],
                   [Imlib2 (pixmap themes) support ([default=yes])]), ,
                   [enable_imlib2=yes])

So all of this should only be done if BR2_PACKAGE_IMLIB2 is enabled.

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 Samuel> ---
 Samuel>  package/fluxbox/fluxbox-fix-configure.patch | 19 +++++++++++++++++++

Please consider sending this patch upstream.


 Samuel>  package/fluxbox/fluxbox.mk                  |  7 ++++---
 Samuel>  2 files changed, 23 insertions(+), 3 deletions(-)
 Samuel>  create mode 100644 package/fluxbox/fluxbox-fix-configure.patch

 Samuel> diff --git a/package/fluxbox/fluxbox-fix-configure.patch b/package/fluxbox/fluxbox-fix-configure.patch
 Samuel> new file mode 100644
 Samuel> index 0000000..a739f08
 Samuel> --- /dev/null
 Samuel> +++ b/package/fluxbox/fluxbox-fix-configure.patch
 Samuel> @@ -0,0 +1,19 @@
 Samuel> +Avoid to call the imlib2-config that may be installed on the host system
 Samuel> +(even when --with-imlib2-prefix or  --with-imlib2-exec-prefix is passed to
 Samuel> +the configure script), which totally screws up the resulting linker flags.
 Samuel> +
 Samuel> +Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 Samuel> +
 Samuel> +--- fluxbox-1.3.2.orig/configure.in	2012-10-21 16:11:59.445749396 +0200
 Samuel> ++++ fluxbox-1.3.2/configure.in	2012-10-21 16:35:27.658390856 +0200
 Samuel> +@@ -443,8 +443,8 @@ if test x$enable_imlib2 = "xyes"; then
 Samuel> +       [
 Samuel> +          IMLIB2=true
 Samuel> +          AC_DEFINE(HAVE_IMLIB2, [], [Imlib2 support])
 Samuel> +-         IMLIB2_LIBS=`imlib2-config --libs`
 Samuel> +-         IMLIB2_CFLAGS=`imlib2-config --cflags`
 Samuel> ++         IMLIB2_LIBS=`$IMLIB2_CONFIG --libs`
 Samuel> ++         IMLIB2_CFLAGS=`$IMLIB2_CONFIG --cflags`
 Samuel> +          LIBS="$LIBS $IMLIB2_LIBS"
 Samuel> +          CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS"
 Samuel> +        ], [ AC_MSG_RESULT(no)]
 Samuel> diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
 Samuel> index 15136c9..bb34379 100644
 Samuel> --- a/package/fluxbox/fluxbox.mk
 Samuel> +++ b/package/fluxbox/fluxbox.mk
 Samuel> @@ -7,11 +7,12 @@
 Samuel>  FLUXBOX_VERSION = 1.3.2
 Samuel>  FLUXBOX_SOURCE = fluxbox-$(FLUXBOX_VERSION).tar.bz2
 Samuel>  FLUXBOX_SITE = http://downloads.sourceforge.net/project/fluxbox/fluxbox/$(FLUXBOX_VERSION)
 Samuel> -
 Samuel> +FLUXBOX_AUTORECONF = YES
 Samuel>  FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 Samuel> -		   --x-libraries=$(STAGING_DIR)/usr/lib
 Samuel> +		   --x-libraries=$(STAGING_DIR)/usr/lib \
 Samuel> +		   --with-imlib2-prefix=$(STAGING_DIR)/usr
 
 Samuel> -FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 Samuel> +FLUXBOX_DEPENDENCIES = imlib2 xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 Samuel>  define FLUXBOX_INSTALL_XSESSION_FILE
 Samuel>  	[ -f $(TARGET_DIR)/root/.xsession ] || $(INSTALL) -m 0755 -D \
 Samuel> -- 
 Samuel> 1.8.0

 Samuel> _______________________________________________
 Samuel> buildroot mailing list
 Samuel> buildroot at busybox.net
 Samuel> http://lists.busybox.net/mailman/listinfo/buildroot


-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 07/33] fluxbox: fix build against imlib2

[Samuel Martin]

Hi Peter, all,

2012/11/23 Peter Korsgaard <jacmet@uclibc.org>:
>>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
>
>  Samuel> * fix missing dependency
>  Samuel> * set imlib2 prefix at configure time
>  Samuel> * fix configure script to take account of the imlib2 prefix if any
>
> Ehh, fluxbox doesn't select imlib2 in it's Config.in and it looks like
> it's an optional dependency:
>
> From configure.in:
>
> dnl Check whether to use imlib2
> IMLIB2=false
> AC_MSG_CHECKING([whether to have Imlib2 (pixmap themes) support])
> AC_ARG_ENABLE(imlib2,
>     AC_HELP_STRING([--enable-imlib2],
>                    [Imlib2 (pixmap themes) support ([default=yes])]), ,
>                    [enable_imlib2=yes])
>
> So all of this should only be done if BR2_PACKAGE_IMLIB2 is enabled.
Right, I'll recook the patch.

>
>  Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>  Samuel> ---
>  Samuel>  package/fluxbox/fluxbox-fix-configure.patch | 19 +++++++++++++++++++
>
> Please consider sending this patch upstream.
Done.

Regards,

-- 
Sam

[Buildroot] [PATCH 08/33] owl-linux: update help text about linux kernel dependencies.

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/owl-linux/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/owl-linux/Config.in b/package/owl-linux/Config.in
index f6e18d5..1dcf5f1 100644
--- a/package/owl-linux/Config.in
+++ b/package/owl-linux/Config.in
@@ -6,6 +6,8 @@ config BR2_PACKAGE_OWL_LINUX
 	help
 	  Linux kernel driver for the H&D Wireless SPB104 SD-card WiFi SIP.
 
+	  owl-linux requires the hidden kernel option WIRELESS_EXT enabled.
+
 	  http://linux.hd-wireless.se/bin/view/Linux/GettingStarted
 
 comment "owl-linux requires a Linux kernel"
-- 
1.8.0

[Buildroot] [PATCH 08/33] owl-linux: update help text about linux kernel dependencies.

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 Samuel> ---
 Samuel>  package/owl-linux/Config.in | 2 ++
 Samuel>  1 file changed, 2 insertions(+)

 Samuel> diff --git a/package/owl-linux/Config.in b/package/owl-linux/Config.in
 Samuel> index f6e18d5..1dcf5f1 100644
 Samuel> --- a/package/owl-linux/Config.in
 Samuel> +++ b/package/owl-linux/Config.in
 Samuel> @@ -6,6 +6,8 @@ config BR2_PACKAGE_OWL_LINUX
 Samuel>  	help
 Samuel>  	  Linux kernel driver for the H&D Wireless SPB104 SD-card WiFi SIP.
 
 Samuel> +	  owl-linux requires the hidden kernel option WIRELESS_EXT enabled.
 Samuel> +

Committed, thanks. Perhaps it would make sense to automatically enable
that option in linux.mk when owl is enabled?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 09/33] linux-fusion: fix build

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 .../linux-fusion/linux-fusion-fix-include.patch    | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 package/linux-fusion/linux-fusion-fix-include.patch

diff --git a/package/linux-fusion/linux-fusion-fix-include.patch b/package/linux-fusion/linux-fusion-fix-include.patch
new file mode 100644
index 0000000..fe91488
--- /dev/null
+++ b/package/linux-fusion/linux-fusion-fix-include.patch
@@ -0,0 +1,52 @@
+Fix directfb-fusion kernel module build.
+
+This patch avoids the following error occurs:
+
+/usr/bin/make -f scripts/Makefile.build obj=/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion /opt/br/output/host/usr/bin/ccache 
+  /opt/br/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -Wp,-MD,/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/.fusioncore_impl.o.d
+  -nostdinc -isystem /opt/br/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/include -I/opt/br/output/build/linux-3.6/arch/arm/include 
+  -Iarch/arm/include/generated -Iinclude  -include /opt/br/output/build/linux-3.6/include/linux/kconfig.h -D__KERNEL__ -mlittle-endian -Iarch/arm/mach-versatile/include
+  -Iarch/arm/plat-versatile/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/opt/br/output/build/linux-fusion-8.8.1/linux/include -Wall -Wundef 
+  -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration -Wno-format-security -fno-delete-null-pointer-checks -O2 -marm 
+  -fno-dwarf2-cfi-asm -mabi=aapcs-linux -mno-thumb-interwork -funwind-tables -D__LINUX_ARM_ARCH__=5 -march=armv5te -mtune=arm9tdmi -msoft-float -Uarm -Wframe-larger-than=1024
+  -fno-stack-protector -Wno-unused-but-set-variable -fomit-frame-pointer -Wdeclaration-after-statement -Wno-pointer-sign -fno-strict-overflow -fconserve-stack  -DMODULE
+  -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(fusioncore_impl)"  -D"KBUILD_MODNAME=KBUILD_STR(fusion)" -c -o 
+/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.o /opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c
+/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c:25:19: fatal error: debug.h: No such file or directory
+compilation terminated.
+make[3]: *** [/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.o] Error 1
+make[2]: *** [_module_/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion] Error 2
+make[2]: Leaving directory `/opt/br/output/build/linux-3.6'
+make[1]: *** [modules] Error 2
+make[1]: Leaving directory `/opt/br/output/build/linux-fusion-8.8.1'
+
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+diff -purN linux-fusion-8.8.1.orig/linux/drivers/char/fusion/fusioncore.h linux-fusion-8.8.1/linux/drivers/char/fusion/fusioncore.h
+--- linux-fusion-8.8.1.orig/linux/drivers/char/fusion/fusioncore.h	2012-10-15 21:47:53.881834496 +0200
++++ linux-fusion-8.8.1/linux/drivers/char/fusion/fusioncore.h	2012-10-15 22:05:27.232401023 +0200
+@@ -17,7 +17,7 @@
+ 
+ #include <linux/stddef.h>
+ 
+-#include "fusioncore_impl.h"
++#include "single/fusioncore_impl.h"
+ 
+ typedef enum {
+      FC_OK,
+diff -purN linux-fusion-8.8.1.orig/linux/drivers/char/fusion/single/fusioncore_impl.c linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c
+--- linux-fusion-8.8.1.orig/linux/drivers/char/fusion/single/fusioncore_impl.c	2012-10-15 21:47:53.878501243 +0200
++++ linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c	2012-10-15 22:05:38.585511304 +0200
+@@ -22,9 +22,9 @@
+ #include <linux/slab.h>
+ #include <linux/sched.h>
+ 
+-#include "debug.h"
++#include "../debug.h"
+ 
+-#include "fusioncore.h"
++#include "../fusioncore.h"
+ 
+ 
+ 
-- 
1.8.0

[Buildroot] [PATCH 09/33] linux-fusion: fix build

[Simon Dawson]

On 22 November 2012 00:17, Samuel Martin <s.martin49@gmail.com> wrote:
>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
>  .../linux-fusion/linux-fusion-fix-include.patch    | 52 ++++++++++++++++++++++
>  1 file changed, 52 insertions(+)
>  create mode 100644 package/linux-fusion/linux-fusion-fix-include.patch
>

Acked-by: Simon Dawson <spdawson@gmail.com>
Tested-by: Simon Dawson <spdawson@gmail.com>
 (built-test on a minimal arm config)

[Buildroot] [PATCH 09/33] linux-fusion: fix build

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 10/33] ltp-testsuite: add warning about bessel function support if uclibc toolchain

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/ltp-testsuite/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index 86aa4fb..30ba70f 100644
--- a/package/ltp-testsuite/Config.in
+++ b/package/ltp-testsuite/Config.in
@@ -1,3 +1,7 @@
+comment "Note that ltp-testsuite needs a uclibc toolchain with DO_XSI_MATH (bessel functions) enabled"
+	depends on BR2_PACKAGE_LTP_TESTSUITE
+	depends on BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_EXTERNAL_UCLIBC || BR2_TOOLCHAIN_CTNG_uClibc
+
 config BR2_PACKAGE_LTP_TESTSUITE
 	bool "ltp-testsuite"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-- 
1.8.0

[Buildroot] [PATCH 10/33] ltp-testsuite: add warning about bessel function support if uclibc toolchain

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 Samuel> ---
 Samuel>  package/ltp-testsuite/Config.in | 4 ++++
 Samuel>  1 file changed, 4 insertions(+)

 Samuel> diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
 Samuel> index 86aa4fb..30ba70f 100644
 Samuel> --- a/package/ltp-testsuite/Config.in
 Samuel> +++ b/package/ltp-testsuite/Config.in
 Samuel> @@ -1,3 +1,7 @@
 Samuel> +comment "Note that ltp-testsuite needs a uclibc toolchain with DO_XSI_MATH (bessel functions) enabled"

It also needs UCLIBC_HAS_OBSOLETE_BSD_SIGNAL and UCLIBC_SV4_DEPRECATED
so I reworked this a bit and committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 11/33] ltp-testsuite: fix build on uClibc exp10

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 ...tsuite-20101031-fix-build-on-uClibc-exp10.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch

diff --git a/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch b/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch
new file mode 100644
index 0000000..7a02d95
--- /dev/null
+++ b/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch
@@ -0,0 +1,22 @@
+Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch
+
+exp10 extension is not part of uClibc, so compute it.
+
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+diff -purN ltp-testsuite-20101031.orig/testcases/realtime/lib/libstats.c ltp-testsuite-20101031/testcases/realtime/lib/libstats.c
+--- ltp-testsuite-20101031.orig/testcases/realtime/lib/libstats.c	2012-10-22 23:19:02.306646174 +0200
++++ ltp-testsuite-20101031/testcases/realtime/lib/libstats.c	2012-10-22 23:25:41.554847766 +0200
+@@ -46,6 +46,11 @@
+ #include <libstats.h>
+ #include <librttest.h>
+ 
++#ifdef __UCLIBC__
++/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
++#define exp10(x) (exp((x) * log(10)))
++#endif /* __UCLIBC__ */
++
+ int save_stats = 0;
+ 
+ /* static helper functions */
-- 
1.8.0

[Buildroot] [PATCH 11/33] ltp-testsuite: fix build on uClibc exp10

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 Samuel> ---
 Samuel>  ...tsuite-20101031-fix-build-on-uClibc-exp10.patch | 22 ++++++++++++++++++++++
 Samuel>  1 file changed, 22 insertions(+)
 Samuel>  create mode 100644 package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch

 Samuel> diff --git a/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch b/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch
 Samuel> new file mode 100644
 Samuel> index 0000000..7a02d95
 Samuel> --- /dev/null
 Samuel> +++ b/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch
 Samuel> @@ -0,0 +1,22 @@
 Samuel> +Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch

Nice ;)

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 12/33] sconeserver: fix configure.in

[Samuel Martin]

Prevent from having '-I/usr/include/mysql' appended to the cflags during
the configuration phase.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 ...n-do-not-hardcode-mysql-include-directory.patch | 27 ++++++++++++++++++++++
 package/sconeserver/sconeserver.mk                 |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 package/sconeserver/sconeserver-180-configure.in-do-not-hardcode-mysql-include-directory.patch

diff --git a/package/sconeserver/sconeserver-180-configure.in-do-not-hardcode-mysql-include-directory.patch b/package/sconeserver/sconeserver-180-configure.in-do-not-hardcode-mysql-include-directory.patch
new file mode 100644
index 0000000..9388d21
--- /dev/null
+++ b/package/sconeserver/sconeserver-180-configure.in-do-not-hardcode-mysql-include-directory.patch
@@ -0,0 +1,27 @@
+From 79aafd560037537baba3f08e9ed15a2b926a16de Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Sat, 17 Nov 2012 20:18:51 +0100
+Subject: [PATCH 1/1] configure.in: do not hardcode mysql include directory
+
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 936130f..bc15ef2 100644
+--- a/configure.in
++++ b/configure.in
+@@ -234,7 +234,7 @@ AC_ARG_WITH([mysql],
+ # Need mysqlclient library for mysql
+ if test "x$MYSQL" == "xyes"; then
+   AC_CHECK_LIB([mysqlclient],[mysql_init],
+-    [CXXFLAGS="$CXXFLAGS -I/usr/include/mysql"
++    [CXXFLAGS="$CXXFLAGS"
+      MYSQL_LIBADD="-lmysqlclient"
+      AC_SUBST(MYSQL_LIBADD)],
+     [AC_MSG_ERROR([library 'mysqlclient' is required for the mysql module])]
+-- 
+1.8.0
+
diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index 15a1edc..d6c9639 100644
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -13,6 +13,8 @@ SCONESERVER_SITE_METHOD = svn
 SCONESERVER_LICENSE = GPLv2+
 SCONESERVER_LICENSE_FILES = COPYING
 
+SCONESERVER_AUTORECONF = YES
+
 SCONESERVER_DEPENDENCIES += pcre
 SCONESERVER_CONF_OPT += --with-ip --with-local
 
-- 
1.8.0

[Buildroot] [PATCH 13/33] sconeserver: fix imagemagick dependency

[Samuel Martin]

* only depends on imagemagick when C++ support is enable
* use 'pkg-config Magick++' instead of Magick++-config

Fixes:
http://autobuild.buildroot.net/results/e8a71a731dafb2eaee0454b5b1a51cd6de4ecdc6/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/sconeserver/Config.in                      |  3 ++
 ...-dependency-use-pkg-config-instead-of-Mag.patch | 41 ++++++++++++++++++++++
 package/sconeserver/sconeserver.mk                 |  2 +-
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 package/sconeserver/sconeserver-180-ImageMagick-dependency-use-pkg-config-instead-of-Mag.patch

diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in
index a7e5c75..74722a0 100644
--- a/package/sconeserver/Config.in
+++ b/package/sconeserver/Config.in
@@ -26,6 +26,9 @@ config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE
 config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE
 	bool "http::sconesite::image"
 	depends on BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE
+	# sconesite-image requires Magick++.h which is only available if
+	# C++ compiler is working.
+	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_IMAGEMAGICK
 	help
 	  http::sconesite::image module for Sconeserver
diff --git a/package/sconeserver/sconeserver-180-ImageMagick-dependency-use-pkg-config-instead-of-Mag.patch b/package/sconeserver/sconeserver-180-ImageMagick-dependency-use-pkg-config-instead-of-Mag.patch
new file mode 100644
index 0000000..58298c8
--- /dev/null
+++ b/package/sconeserver/sconeserver-180-ImageMagick-dependency-use-pkg-config-instead-of-Mag.patch
@@ -0,0 +1,41 @@
+From 278cacf17370756a1d620ffa8898c889051d19bf Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Sat, 17 Nov 2012 18:18:17 +0100
+Subject: [PATCH 1/1] ImageMagick dependency: use pkg-config instead of
+ Magick++-config
+
+Magick++-config is nothing more than a wrapper using pkg-config.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ configure.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 241e66b..936130f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -185,7 +185,7 @@ fi
+ 
+ # Look for ImageMagick settings
+ AC_CHECK_LIB([Magick++],[InitializeMagick],
+-  [CPPFLAGS="$CPPFLAGS `Magick++-config --cppflags`"],,
++  [CPPFLAGS="$CPPFLAGS `pkg-config Magick++ --cflags`"],,
+ )
+ 
+ # Sconesite:image module
+@@ -202,9 +202,9 @@ if test "x$SCONESITE_IMAGE" == "xyes"; then
+   if test "x$ac_cv_lib_Magickpp_InitializeMagick" != "xyes"; then
+     AC_MSG_ERROR([library 'Magick++' is required for Sconesite:image])
+   fi
+-  SCONESITE_IMAGE_LIBADD=`Magick++-config --libs`
++  SCONESITE_IMAGE_LIBADD=`pkg-config Magick++ --libs`
+   AC_SUBST(SCONESITE_IMAGE_LIBADD)
+-  SCONESITE_IMAGE_LDFLAGS=`Magick++-config --ldflags`
++  SCONESITE_IMAGE_LDFLAGS=`pkg-config Magick++ --libs`
+   AC_SUBST(SCONESITE_IMAGE_LDFLAGS)
+ fi
+ 
+-- 
+1.8.0
+
diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index d6c9639..aa5688a 100644
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -53,7 +53,7 @@ else
 endif
 
 ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y)
-	SCONESERVER_DEPENDENCIES += imagemagick
+	SCONESERVER_DEPENDENCIES += imagemagick host-pkgconf
 	SCONESERVER_CONF_OPT += --with-sconesite-image
 else
 	SCONESERVER_CONF_OPT += --without-sconesite-image
-- 
1.8.0

[Buildroot] [PATCH 14/33] dependencies: build a host python2 if no suitable one can be found

[Samuel Martin]

Some distros choose to change the /usr/bin/python binary, making it pointed
to python3 instead of python2.

This may have some bad consequences for packages that uses some
non-python3-compliant python scripts in their build system (eg. in install
or post-install scripts).

This patch checks for a suitable python2 version (2.6 or 2.7) on the host
system, and declares the following variables:
- PYTHON2: pointing to the host python2 binary;
- NEED_PYTHON2: sets to "host-python" if no python2 binary has been found.

This way, a package using some python2 scripts must:
- adds $(NEED_PYTHON2) to its dependency list;
- sets $(PYTHON2) as the python binary to be used.

A side effect of this patch is getting rid of any host python. Buildroot
can runs on a host without python, or with a too old python2 version, or
with only python3; in such case, $(NEED_PYTHON2) should be added to the
dependency list. So, we can get rid of the python dependency check.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 support/dependencies/check-host-python2.mk |  6 ++++++
 support/dependencies/check-host-python2.sh | 13 +++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 support/dependencies/check-host-python2.mk
 create mode 100755 support/dependencies/check-host-python2.sh

diff --git a/support/dependencies/check-host-python2.mk b/support/dependencies/check-host-python2.mk
new file mode 100644
index 0000000..ddae701
--- /dev/null
+++ b/support/dependencies/check-host-python2.mk
@@ -0,0 +1,6 @@
+PYTHON2 = $(call suitable-host-package,python2)
+
+ifeq ($(PYTHON2),)
+  NEED_PYTHON2 = host-python
+  PYTHON2 = $(HOST_DIR)/usr/bin/python
+endif
diff --git a/support/dependencies/check-host-python2.sh b/support/dependencies/check-host-python2.sh
new file mode 100755
index 0000000..6ad4b3a
--- /dev/null
+++ b/support/dependencies/check-host-python2.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+candidates="python python2"
+
+for candidate in ${candidates} ; do
+  which ${candidate} &>/dev/null || continue
+  # restrict version of python2 to 2.6 or 2.7
+  if ${candidate} --version 2>&1 | grep -q 'Python 2\.[6-7].*' ; then
+    # found a valid candidate, so quit now
+    echo $(which ${candidate})
+    exit
+  fi
+done
-- 
1.8.0

[Buildroot] [PATCH 15/33] scons: force to use python2 on the host

[Samuel Martin]

Scons is not yet python2/python3 compliant.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/scons/scons.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index 7cc234e..45f2e1e 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -1,13 +1,14 @@
 SCONS_VERSION = 2.0.1
 SCONS_SOURCE = scons-$(SCONS_VERSION).tar.gz
 SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION)
+HOST_SCONS_DEPENDENCIES = $(NEED_PYTHON2)
 
 define HOST_SCONS_BUILD_CMDS
-	(cd $(@D); python setup.py build)
+	(cd $(@D); $(PYTHON2) setup.py build)
 endef
 
 define HOST_SCONS_INSTALL_CMDS
-	(cd $(@D); python setup.py install --prefix=$(HOST_DIR)/usr \
+	(cd $(@D); $(PYTHON2) setup.py install --prefix=$(HOST_DIR)/usr \
 		--install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION))
 endef
 
-- 
1.8.0

[Buildroot] [PATCH 16/33] libmad: do not install mad.pc on the target

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/libmad/libmad.mk | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index d9ce0ae..6999b66 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -19,14 +19,8 @@ define LIBMAD_INSTALL_STAGING_PC
 		$(STAGING_DIR)/usr/lib/pkgconfig/mad.pc
 endef
 
-define LIBMAD_INSTALL_TARGET_PC
-	$(INSTALL) -D package/libmad/mad.pc \
-		$(TARGET_DIR)/usr/lib/pkgconfig/mad.pc
-endef
-
 LIBMAD_POST_PATCH_HOOKS += LIBMAD_PREVENT_AUTOMAKE
 LIBMAD_POST_INSTALL_STAGING_HOOKS += LIBMAD_INSTALL_STAGING_PC
-LIBMAD_POST_INSTALL_TARGET_HOOKS += LIBMAD_INSTALL_TARGET_PC
 
 LIBMAD_CONF_OPT = \
 		--disable-debugging \
-- 
1.8.0

[Buildroot] [PATCH 17/33] matchbox packages: fix broken urls

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/matchbox/matchbox-common/matchbox-common.mk     | 6 +++---
 package/matchbox/matchbox-desktop/matchbox-desktop.mk   | 5 +++--
 package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 2 +-
 package/matchbox/matchbox-lib/matchbox-lib.mk           | 2 +-
 package/matchbox/matchbox-panel/matchbox-panel.mk       | 6 +++---
 package/matchbox/matchbox-wm/matchbox-wm.mk             | 2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
index 2e3cdff..993590c 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -3,10 +3,10 @@
 # MatchBox Common
 #
 #############################################################
-
-MATCHBOX_COMMON_VERSION = 0.9.1
+MATCHBOX_COMMON_VERSION_MAJOR = 0.9
+MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1
 MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2
-MATCHBOX_COMMON_SITE = http://matchbox-project.org/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION)
+MATCHBOX_COMMON_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR)
 MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib
 
 ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y)
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index 5c518e5..c5f5b0d 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -4,9 +4,10 @@
 #
 #############################################################
 
-MATCHBOX_DESKTOP_VERSION = 0.9.1
+MATCHBOX_DESKTOP_VERSION_MAJOR = 0.9
+MATCHBOX_DESKTOP_VERSION = $(MATCHBOX_DESKTOP_VERSION_MAJOR).1
 MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2
-MATCHBOX_DESKTOP_SITE = http://matchbox-project.org/sources/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION)
+MATCHBOX_DESKTOP_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR)
 MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib
 MATCHBOX_DESKTOP_CONF_OPT = --enable-expat
 
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index c6e9496..2da8dfa 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -6,7 +6,7 @@
 
 MATCHBOX_KEYBOARD_VERSION = 0.1
 MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2
-MATCHBOX_KEYBOARD_SITE = http://matchbox-project.org/sources/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
+MATCHBOX_KEYBOARD_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
 MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey
 
 # Workaround bug in configure script
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index de11dfc..c9d7600 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -6,7 +6,7 @@
 
 MATCHBOX_LIB_VERSION = 1.9
 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
-MATCHBOX_LIB_SITE = http://matchbox-project.org/sources/libmatchbox/$(MATCHBOX_LIB_VERSION)
+MATCHBOX_LIB_SITE = http://projects.o-hand.com/matchbox/sources/libmatchbox/$(MATCHBOX_LIB_VERSION)
 MATCHBOX_LIB_INSTALL_STAGING = YES
 MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
 MATCHBOX_LIB_CONF_OPT = --enable-expat --disable-doxygen-docs
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index db9d1a8..e216fed 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -3,10 +3,10 @@
 # MatchBox Panel
 #
 #############################################################
-
-MATCHBOX_PANEL_VERSION = 0.9.3
+MATCHBOX_PANEL_VERSION_MAJOR = 0.9
+MATCHBOX_PANEL_VERSION = $(MATCHBOX_PANEL_VERSION_MAJOR).3
 MATCHBOX_PANEL_SOURCE = matchbox-panel-$(MATCHBOX_PANEL_VERSION).tar.bz2
-MATCHBOX_PANEL_SITE = http://matchbox-project.org/sources/matchbox-panel/$(MATCHBOX_PANEL_VERSION)
+MATCHBOX_PANEL_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-panel/$(MATCHBOX_PANEL_VERSION_MAJOR)
 MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib
 MATCHBOX_PANEL_CONF_OPT = --enable-expat
 
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
index ece8866..1a07a58 100644
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
@@ -6,7 +6,7 @@
 
 MATCHBOX_WM_VERSION = 1.2
 MATCHBOX_WM_SOURCE = matchbox-window-manager-$(MATCHBOX_WM_VERSION).tar.bz2
-MATCHBOX_WM_SITE = http://matchbox-project.org/sources/matchbox-window-manager/$(MATCHBOX_WM_VERSION)
+MATCHBOX_WM_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/$(MATCHBOX_WM_VERSION)
 MATCHBOX_WM_DEPENDENCIES = matchbox-lib
 MATCHBOX_WM_CONF_OPT = --enable-expat
 
-- 
1.8.0

[Buildroot] [PATCH 17/33] matchbox packages: fix broken urls

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 Samuel> ---
 Samuel>  package/matchbox/matchbox-common/matchbox-common.mk     | 6 +++---
 Samuel>  package/matchbox/matchbox-desktop/matchbox-desktop.mk   | 5 +++--
 Samuel>  package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 2 +-
 Samuel>  package/matchbox/matchbox-lib/matchbox-lib.mk           | 2 +-
 Samuel>  package/matchbox/matchbox-panel/matchbox-panel.mk       | 6 +++---
 Samuel>  package/matchbox/matchbox-wm/matchbox-wm.mk             | 2 +-
 Samuel>  6 files changed, 12 insertions(+), 11 deletions(-)

 Samuel> diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
 Samuel> index 2e3cdff..993590c 100644
 Samuel> --- a/package/matchbox/matchbox-common/matchbox-common.mk
 Samuel> +++ b/package/matchbox/matchbox-common/matchbox-common.mk
 Samuel> @@ -3,10 +3,10 @@
 Samuel>  # MatchBox Common
 Samuel>  #
 Samuel>  #############################################################
 Samuel> -
 Samuel> -MATCHBOX_COMMON_VERSION = 0.9.1
 Samuel> +MATCHBOX_COMMON_VERSION_MAJOR = 0.9
 Samuel> +MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1
 Samuel>  MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2
 Samuel> -MATCHBOX_COMMON_SITE = http://matchbox-project.org/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION)
 Samuel> +MATCHBOX_COMMON_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR)

Hmm, projects.o-hand.com doesn't seem to exist?

host -a projects.o-hand.com
Trying "projects.o-hand.com"
Received 105 bytes from 64.71.0.60#53 in 59 ms
Trying "projects.o-hand.com"
Host projects.o-hand.com not found: 3(NXDOMAIN)

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 17/33] matchbox packages: fix broken urls

[Samuel Martin]

2012/11/30 Peter Korsgaard <jacmet@uclibc.org>:
>>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
[...]
>  Samuel> -MATCHBOX_COMMON_SITE = http://matchbox-project.org/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION)
>  Samuel> +MATCHBOX_COMMON_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR)
>
> Hmm, projects.o-hand.com doesn't seem to exist?
At least, it did...

>
> host -a projects.o-hand.com
> Trying "projects.o-hand.com"
> Received 105 bytes from 64.71.0.60#53 in 59 ms
> Trying "projects.o-hand.com"
> Host projects.o-hand.com not found: 3(NXDOMAIN)
Indeed... it seems pretty down :-(

Luckily, by the time this patch tried to be merged it got down!

Well, I'll switch to some alive location and repost.


Regards,

-- 
Sam

[Buildroot] [PATCH 17/33] matchbox packages: fix broken urls

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Indeed... it seems pretty down :-(

 Samuel> Luckily, by the time this patch tried to be merged it got down!

 Samuel> Well, I'll switch to some alive location and repost.

Thanks!

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH] matchbox packages: fix broken urls

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/matchbox/matchbox-common/matchbox-common.mk                 | 6 +++---
 package/matchbox/matchbox-desktop/matchbox-desktop.mk               | 5 +++--
 package/matchbox/matchbox-fakekey/matchbox-fakekey.mk               | 2 +-
 package/matchbox/matchbox-keyboard/matchbox-keyboard.mk             | 2 +-
 package/matchbox/matchbox-lib/matchbox-lib.mk                       | 2 +-
 package/matchbox/matchbox-panel/matchbox-panel.mk                   | 6 +++---
 .../matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk   | 2 +-
 package/matchbox/matchbox-wm/matchbox-wm.mk                         | 2 +-
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
index 2e3cdff..3248e74 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -3,10 +3,10 @@
 # MatchBox Common
 #
 #############################################################
-
-MATCHBOX_COMMON_VERSION = 0.9.1
+MATCHBOX_COMMON_VERSION_MAJOR = 0.9
+MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1
 MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2
-MATCHBOX_COMMON_SITE = http://matchbox-project.org/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION)
+MATCHBOX_COMMON_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR)
 MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib
 
 ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y)
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index 5c518e5..2ef29c6 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -4,9 +4,10 @@
 #
 #############################################################
 
-MATCHBOX_DESKTOP_VERSION = 0.9.1
+MATCHBOX_DESKTOP_VERSION_MAJOR = 0.9
+MATCHBOX_DESKTOP_VERSION = $(MATCHBOX_DESKTOP_VERSION_MAJOR).1
 MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2
-MATCHBOX_DESKTOP_SITE = http://matchbox-project.org/sources/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION)
+MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR)
 MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib
 MATCHBOX_DESKTOP_CONF_OPT = --enable-expat
 
diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
index 255f3c1..7a6ac00 100644
--- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
+++ b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
@@ -6,7 +6,7 @@
 
 MATCHBOX_FAKEKEY_VERSION = 0.1
 MATCHBOX_FAKEKEY_SOURCE = libfakekey-$(MATCHBOX_FAKEKEY_VERSION).tar.bz2
-MATCHBOX_FAKEKEY_SITE = http://matchbox-project.org/sources/libfakekey/$(MATCHBOX_FAKEKEY_VERSION)
+MATCHBOX_FAKEKEY_SITE = http://downloads.yoctoproject.org/releases/matchbox/libfakekey/$(MATCHBOX_FAKEKEY_VERSION)
 MATCHBOX_FAKEKEY_INSTALL_STAGING = YES
 MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
 MATCHBOX_FAKEKEY_CONF_OPT = --enable-expat
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index c6e9496..44aab5c 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -6,7 +6,7 @@
 
 MATCHBOX_KEYBOARD_VERSION = 0.1
 MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2
-MATCHBOX_KEYBOARD_SITE = http://matchbox-project.org/sources/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
+MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
 MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey
 
 # Workaround bug in configure script
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index de11dfc..0fa9bcc 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -6,7 +6,7 @@
 
 MATCHBOX_LIB_VERSION = 1.9
 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
-MATCHBOX_LIB_SITE = http://matchbox-project.org/sources/libmatchbox/$(MATCHBOX_LIB_VERSION)
+MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION)
 MATCHBOX_LIB_INSTALL_STAGING = YES
 MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
 MATCHBOX_LIB_CONF_OPT = --enable-expat --disable-doxygen-docs
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index db9d1a8..0e980ef 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -3,10 +3,10 @@
 # MatchBox Panel
 #
 #############################################################
-
-MATCHBOX_PANEL_VERSION = 0.9.3
+MATCHBOX_PANEL_VERSION_MAJOR = 0.9
+MATCHBOX_PANEL_VERSION = $(MATCHBOX_PANEL_VERSION_MAJOR).3
 MATCHBOX_PANEL_SOURCE = matchbox-panel-$(MATCHBOX_PANEL_VERSION).tar.bz2
-MATCHBOX_PANEL_SITE = http://matchbox-project.org/sources/matchbox-panel/$(MATCHBOX_PANEL_VERSION)
+MATCHBOX_PANEL_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/$(MATCHBOX_PANEL_VERSION_MAJOR)
 MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib
 MATCHBOX_PANEL_CONF_OPT = --enable-expat
 
diff --git a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
index 6f37bf4..6b30e80 100644
--- a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
+++ b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
@@ -6,7 +6,7 @@
 
 MATCHBOX_STARTUP_MONITOR_VERSION = 0.1
 MATCHBOX_STARTUP_MONITOR_SOURCE = mb-applet-startup-monitor-$(MATCHBOX_STARTUP_MONITOR_VERSION).tar.bz2
-MATCHBOX_STARTUP_MONITOR_SITE = http://matchbox-project.org/sources/mb-applet-startup-monitor/$(MATCHBOX_STARTUP_MONITOR_VERSION)
+MATCHBOX_STARTUP_MONITOR_SITE = http://downloads.yoctoproject.org/releases/matchbox/mb-applet-startup-monitor/$(MATCHBOX_STARTUP_MONITOR_VERSION)
 MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification
 MATCHBOX_STARTUP_MONITOR_CONF_OPT =
 
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
index ece8866..b04cf76 100644
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
@@ -6,7 +6,7 @@
 
 MATCHBOX_WM_VERSION = 1.2
 MATCHBOX_WM_SOURCE = matchbox-window-manager-$(MATCHBOX_WM_VERSION).tar.bz2
-MATCHBOX_WM_SITE = http://matchbox-project.org/sources/matchbox-window-manager/$(MATCHBOX_WM_VERSION)
+MATCHBOX_WM_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$(MATCHBOX_WM_VERSION)
 MATCHBOX_WM_DEPENDENCIES = matchbox-lib
 MATCHBOX_WM_CONF_OPT = --enable-expat
 
-- 
1.8.0.1

[Buildroot] [PATCH] matchbox packages: fix broken urls

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 18/33] linux-fusion: bump to version 8.10.4

[Samuel Martin]

Also fix directfb build avoiding the following error to occur
(since FCEF_FOLLOW has been added in linux-fusion-8.9.0):

libtool: compile:  /opt/br/output/host/usr/bin/ccache /opt/br/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../lib -I../../include -I../../lib -DDATADIR=\"/usr/share/directfb-1.4.17\" -DMODULEDIR=\"/usr/lib/directfb-1.4-6\" -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -ffast-math -pipe -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -g2 -g3 -fno-inline -Wno-inline -D_GNU_SOURCE -finstrument-functions -std=gnu99 -Werror-implicit-function-declaration -MT call.lo -MD -MP -MF .deps/call.Tpo -c call.c  -fPIC -DPIC -o .libs/call.o
call.c: In function 'fusion_call_execute3':
call.c:311:66: error 'FCEF_FOLLOW' undeclared (first use in this function)
call.c:311:66: note: each undeclared identifier is reported only once for each function it appears in
call.c: In function 'fusion_world_flush_calls':
call.c:444:54: error 'FCEF_FOLLOW' undeclared (first use in this function)
make[5]: *** [call.lo] Error 1
make[5]: Leaving directory `/opt/br/output/build/directfb-1.4.17/lib/fusion'

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/linux-fusion/linux-fusion.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index feb1ab3..631f526 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -3,7 +3,7 @@
 # linux-fusion
 #
 #############################################################
-LINUX_FUSION_VERSION = 8.8.1
+LINUX_FUSION_VERSION = 8.10.4
 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
 LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
 LINUX_FUSION_INSTALL_STAGING = YES
-- 
1.8.0

[Buildroot] [PATCH 18/33] linux-fusion: bump to version 8.10.4

[Simon Dawson]

On 22 November 2012 00:18, Samuel Martin <s.martin49@gmail.com> wrote:
> Also fix directfb build avoiding the following error to occur
> (since FCEF_FOLLOW has been added in linux-fusion-8.9.0):
>
> libtool: compile:  /opt/br/output/host/usr/bin/ccache /opt/br/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../lib -I../../include -I../../lib -DDATADIR=\"/usr/share/directfb-1.4.17\" -DMODULEDIR=\"/usr/lib/directfb-1.4-6\" -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -ffast-math -pipe -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -g2 -g3 -fno-inline -Wno-inline -D_GNU_SOURCE -finstrument-functions -std=gnu99 -Werror-implicit-function-declaration -MT call.lo -MD -MP -MF .deps/call.Tpo -c call.c  -fPIC -DPIC -o .libs/call.o
> call.c: In function 'fusion_call_execute3':
> call.c:311:66: error 'FCEF_FOLLOW' undeclared (first use in this function)
> call.c:311:66: note: each undeclared identifier is reported only once for each function it appears in
> call.c: In function 'fusion_world_flush_calls':
> call.c:444:54: error 'FCEF_FOLLOW' undeclared (first use in this function)
> make[5]: *** [call.lo] Error 1
> make[5]: Leaving directory `/opt/br/output/build/directfb-1.4.17/lib/fusion'
>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
>  package/linux-fusion/linux-fusion.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Acked-by: Simon Dawson <spdawson@gmail.com>
Tested-by: Simon Dawson <spdawson@gmail.com>
 (built-test on a minimal arm config)

[Buildroot] [PATCH 18/33] linux-fusion: bump to version 8.10.4

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Also fix directfb build avoiding the following error to occur
 Samuel> (since FCEF_FOLLOW has been added in linux-fusion-8.9.0):

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 19/33] python2: bump to 2.7.3

[Samuel Martin]

Pyhton 2.7.3 includes several security fixes.
See: http://www.python.org/download/releases/2.7.3/

Also fixes the patch making sqlite optional.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/python/python-2.7-009-python-symlink.patch | 25 -----------------
 .../python-2.7-100-optional-test-modules.patch     |  3 ++-
 package/python/python-2.7-101-optional-pydoc.patch |  3 ++-
 package/python/python-2.7-102-optional-2to3.patch  | 12 +++------
 .../python/python-2.7-103-optional-sqlite.patch    | 31 +++++++++++++++++++++-
 package/python/python-2.7-104-optional-tk.patch    |  3 ++-
 .../python/python-2.7-105-optional-curses.patch    |  3 ++-
 package/python/python-2.7-106-optional-expat.patch |  3 ++-
 package/python/python-2.7-110-optional-db.patch    |  7 ++---
 package/python/python.mk                           |  2 +-
 10 files changed, 48 insertions(+), 44 deletions(-)
 delete mode 100644 package/python/python-2.7-009-python-symlink.patch

diff --git a/package/python/python-2.7-009-python-symlink.patch b/package/python/python-2.7-009-python-symlink.patch
deleted file mode 100644
index 1b1d0c8..0000000
--- a/package/python/python-2.7-009-python-symlink.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Use a symlink between python and pythonVERSION
-
-By default, a hard link is used between /usr/bin/python and
-/usr/bin/pythonVERSION. Using hard links for such things is fairly
-uncommon, so let's make a symbolic link instead.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
----
- Makefile.pre.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: Python-2.7.2/Makefile.pre.in
-===================================================================
---- Python-2.7.2.orig/Makefile.pre.in
-+++ Python-2.7.2/Makefile.pre.in
-@@ -796,7 +796,7 @@
- 	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
- 	else true; \
- 	fi
--	(cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
-+	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) $(PYTHON))
- 	-rm -f $(DESTDIR)$(BINDIR)/python-config
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config)
- 	-test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC)
diff --git a/package/python/python-2.7-100-optional-test-modules.patch b/package/python/python-2.7-100-optional-test-modules.patch
index fc49d52..a988717 100644
--- a/package/python/python-2.7-100-optional-test-modules.patch
+++ b/package/python/python-2.7-100-optional-test-modules.patch
@@ -4,6 +4,7 @@ The Python standard distribution comes with many test modules, that
 are not necessarly useful on embedded targets.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
  Makefile.pre.in |   40 +++++++++++++++++++++++++++-------------
@@ -55,7 +56,7 @@ Index: Python-2.7.2/Makefile.pre.in
 +		ctypes/test distutils/tests unittest/test
 +endif
 +
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-101-optional-pydoc.patch b/package/python/python-2.7-101-optional-pydoc.patch
index 195abcc..ccc937b 100644
--- a/package/python/python-2.7-101-optional-pydoc.patch
+++ b/package/python/python-2.7-101-optional-pydoc.patch
@@ -4,6 +4,7 @@ It removes 0.5 MB of data from the target plus the pydoc script
 itself.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
  Makefile.pre.in |    6 +++++-
@@ -32,7 +33,7 @@ Index: Python-2.7.2/Makefile.pre.in
 +LIBSUBDIRS += pydoc_data
 +endif
 +
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-102-optional-2to3.patch b/package/python/python-2.7-102-optional-2to3.patch
index 1e04540..0321619 100644
--- a/package/python/python-2.7-102-optional-2to3.patch
+++ b/package/python/python-2.7-102-optional-2to3.patch
@@ -4,6 +4,7 @@ lib2to3 is a library to convert Python 2.x code to Python 3.x. As
 such, it is probably not very useful on embedded system targets.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
  Makefile.pre.in |   24 +++++++++++++++++-------
@@ -33,7 +34,7 @@ Index: Python-2.7.2/Makefile.pre.in
  		ctypes/test distutils/tests unittest/test
  endif
  
-@@ -884,6 +882,23 @@
+@@ -884,6 +882,16 @@
  LIBSUBDIRS += pydoc_data
  endif
  
@@ -47,14 +48,7 @@ Index: Python-2.7.2/Makefile.pre.in
 +endif
 +endif
 +
-+ifeq (@SQLITE3@,yes)
-+LIBSUBDIRS += sqlite3
-+ifeq (@TEST_MODULES@,yes)
-+LIBSUBDIRS += sqlite3/test
-+endif
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-103-optional-sqlite.patch b/package/python/python-2.7-103-optional-sqlite.patch
index 4172bae..a915c55 100644
--- a/package/python/python-2.7-103-optional-sqlite.patch
+++ b/package/python/python-2.7-103-optional-sqlite.patch
@@ -1,10 +1,12 @@
 Add option to disable the sqlite3 module
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
+ Makefile.pre.in |   24 +++++++++++++++++-------
  configure.in |    9 +++++++++
- 1 file changed, 9 insertions(+)
+ 2 file changed, 9 insertions(+)
 
 Index: Python-2.7.2/configure.in
 ===================================================================
@@ -26,3 +28,30 @@ Index: Python-2.7.2/configure.in
  AC_SUBST(PYDOC)
  
  AC_ARG_ENABLE(pydoc,
+Index: Python-2.7.2/Makefile.pre.in
+===================================================================
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -875,7 +874,7 @@
+ 		lib-tk/test/test_ttk test test/data \
+ 		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
+ 		test/tracedmodules email/test email/test/data \
+-		json/tests sqlite3/test bsddb/test \
++		json/tests  bsddb/test \
+ 		ctypes/test distutils/tests unittest/test
+ endif
+ 
+@@ -884,6 +882,13 @@
+ LIBSUBDIRS += pydoc_data
+ endif
+ 
++ifeq (@SQLITE3@,yes)
++LIBSUBDIRS += sqlite3
++ifeq (@TEST_MODULES@,yes)
++LIBSUBDIRS += sqlite3/test
++endif
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
diff --git a/package/python/python-2.7-104-optional-tk.patch b/package/python/python-2.7-104-optional-tk.patch
index 12f1236..9333e33 100644
--- a/package/python/python-2.7-104-optional-tk.patch
+++ b/package/python/python-2.7-104-optional-tk.patch
@@ -1,6 +1,7 @@
 Add an option to disable the tk module
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
  Makefile.pre.in |   14 ++++++++++----
@@ -42,7 +43,7 @@ Index: Python-2.7.2/Makefile.pre.in
 +endif
 +endif
 +
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-105-optional-curses.patch b/package/python/python-2.7-105-optional-curses.patch
index e3705cb..7f8da7c 100644
--- a/package/python/python-2.7-105-optional-curses.patch
+++ b/package/python/python-2.7-105-optional-curses.patch
@@ -1,6 +1,7 @@
 Add an option to disable the curses module
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
  Makefile.pre.in |    6 +++++-
@@ -28,7 +29,7 @@ Index: Python-2.7.2/Makefile.pre.in
 +LIBSUBDIRS += curses
 +endif
 +
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-106-optional-expat.patch b/package/python/python-2.7-106-optional-expat.patch
index be1b4a3..2d8ae74 100644
--- a/package/python/python-2.7-106-optional-expat.patch
+++ b/package/python/python-2.7-106-optional-expat.patch
@@ -7,6 +7,7 @@ builtin the Python sources, or no expat at all (which disables the
 installation of XML modules).
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
  Makefile.pre.in |    6 +++++-
@@ -35,7 +36,7 @@ Index: Python-2.7.2/Makefile.pre.in
 +LIBSUBDIRS += $(XMLLIBSUBDIRS)
 +endif
 +
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-110-optional-db.patch b/package/python/python-2.7-110-optional-db.patch
index 0d5ee0c..b32eea9 100644
--- a/package/python/python-2.7-110-optional-db.patch
+++ b/package/python/python-2.7-110-optional-db.patch
@@ -5,6 +5,7 @@ able to build Python without it, this patch adds an option to disable
 the build/installation of this Python module.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 
 ---
  Makefile.pre.in |   10 ++++++++--
@@ -28,8 +29,8 @@ Index: Python-2.7.2/Makefile.pre.in
  LIBSUBDIRS +=   test test/data \
  		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
  		test/tracedmodules email/test email/test/data \
--		json/tests sqlite3/test bsddb/test \
-+		json/tests sqlite3/test \
+-		json/tests  bsddb/test \
++		json/tests \
  		ctypes/test distutils/tests unittest/test
  endif
  
@@ -44,7 +45,7 @@ Index: Python-2.7.2/Makefile.pre.in
 +endif
 +endif
 +
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
 Index: Python-2.7.2/configure.in
diff --git a/package/python/python.mk b/package/python/python.mk
index e0ec9bb..6e960cd 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).2
+PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).3
 PYTHON_SOURCE        = Python-$(PYTHON_VERSION).tar.bz2
 PYTHON_SITE          = http://python.org/ftp/python/$(PYTHON_VERSION)
 PYTHON_LICENSE       = Python software foundation license v2, others
-- 
1.8.0

[Buildroot] [PATCH 19/33] python2: bump to 2.7.3

[Thomas Petazzoni]

Dear Samuel Martin,

On Thu, 22 Nov 2012 01:18:09 +0100, Samuel Martin wrote:
> Pyhton 2.7.3 includes several security fixes.
> See: http://www.python.org/download/releases/2.7.3/
> 
> Also fixes the patch making sqlite optional.
> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
>  package/python/python-2.7-009-python-symlink.patch | 25 -----------------

Any reason for removing this one?

Thanks!

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 19/33] python2: bump to 2.7.3

[Samuel Martin]

2012/11/22 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:
> Dear Samuel Martin,
>
> On Thu, 22 Nov 2012 01:18:09 +0100, Samuel Martin wrote:
>> Pyhton 2.7.3 includes several security fixes.
>> See: http://www.python.org/download/releases/2.7.3/
>>
>> Also fixes the patch making sqlite optional.
>>
>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> ---
>>  package/python/python-2.7-009-python-symlink.patch | 25 -----------------
>
> Any reason for removing this one?
Yes, fixed upstream in the 2.7.3 release :-)
Oops, sorry I forgot to mention this in the commit message; I'll fix it.


Regards,

-- 
Sam

[Buildroot] [PATCH 19/33] python2: bump to 2.7.3

[Thomas Petazzoni]

Dear Samuel Martin,

On Thu, 22 Nov 2012 11:47:21 +0100, Samuel Martin wrote:
> 2012/11/22 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:
> > Dear Samuel Martin,
> >
> > On Thu, 22 Nov 2012 01:18:09 +0100, Samuel Martin wrote:
> >> Pyhton 2.7.3 includes several security fixes.
> >> See: http://www.python.org/download/releases/2.7.3/
> >>
> >> Also fixes the patch making sqlite optional.
> >>
> >> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> >> ---
> >>  package/python/python-2.7-009-python-symlink.patch | 25 -----------------
> >
> > Any reason for removing this one?
> Yes, fixed upstream in the 2.7.3 release :-)

Awesome, something fixed upstream in Python \o/ :-)

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 20/33] pkg-download.mk: add tarball check in the wget method

[Samuel Martin]

In case of wrong package source url, the retrieved file is a html page;
this lead to a build failure at the extraction time.

So, in case of tarballs, check the file type of the downloaded material
and remove the temporary file if it is wrong.

As a side effect of this, if the source location has changed since the
package integration in Buildroot, the download will fall back on the
Buildroot backup site.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/pkg-download.mk              | 13 +++++++++++--
 support/dependencies/dependencies.sh |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 6c57244..5e99d7d 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -175,8 +175,17 @@ endef
 # the next time the download is tried.
 define DOWNLOAD_WGET
 	test -e $(DL_DIR)/$(2) || \
-	($(WGET) -O $(DL_DIR)/$(2).tmp '$(call qstrip,$(1))' && \
-	 mv $(DL_DIR)/$(2).tmp $(DL_DIR)/$(2)) || \
+	(($(WGET) -O $(DL_DIR)/$(2).tmp '$(call qstrip,$(1))' ; \
+	    case "$(2)" in \
+	      *.bz2|*.gz|*.tbz|*.tbz2|*.tgz|*.xz|*.tar) \
+	        file $(DL_DIR)/$(2).tmp | grep -q 'HTML\ document' && \
+	        (rm -f $(DL_DIR)/$(2).tmp ; \
+	          echo "error: Cannot retrieve $(2) from '$(call qstrip,$(1))'." ; \
+	          echo "error: Wrong package URL: $(call qstrip,$(1))") || \
+	        exit 0 ;; \
+	      *) exit 0 ;; \
+	    esac) && \
+	  mv $(DL_DIR)/$(2).tmp $(DL_DIR)/$(2)) || \
 	(rm -f $(DL_DIR)/$(2).tmp ; exit 1)
 endef
 
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 9f0f6a9..651fc51 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -131,7 +131,7 @@ if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then
 fi;
 
 # Check that a few mandatory programs are installed
-for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio python unzip rsync ${DL_TOOLS} ; do
+for prog in awk bison file flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio python unzip rsync ${DL_TOOLS} ; do
     if ! which $prog > /dev/null ; then
 	/bin/echo -e "\nYou must install '$prog' on your build machine";
 	if test $prog = "makeinfo" ; then
-- 
1.8.0

[Buildroot] [PATCH 21/33] rrdtool: add python binding support

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/rrdtool/Config.in                         |  8 +++++++
 package/rrdtool/rrdtool-fix-python-includes.patch | 29 +++++++++++++++++++++++
 package/rrdtool/rrdtool.mk                        | 19 +++++++++++++--
 3 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 package/rrdtool/rrdtool-fix-python-includes.patch

diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in
index d315b57..ed3f71e 100644
--- a/package/rrdtool/Config.in
+++ b/package/rrdtool/Config.in
@@ -11,5 +11,13 @@ config BR2_PACKAGE_RRDTOOL
 
 	  http://oss.oetiker.ch/rrdtool/
 
+if BR2_PACKAGE_RRDTOOL
+
+config BR2_PACKAGE_RRDTOOL_PYTHON
+	bool "Python bindings"
+	depends on BR2_PACKAGE_PYTHON
+
+endif
+
 comment "rrdtool requires a toolchain with WCHAR support"
 	depends on !BR2_USE_WCHAR
diff --git a/package/rrdtool/rrdtool-fix-python-includes.patch b/package/rrdtool/rrdtool-fix-python-includes.patch
new file mode 100644
index 0000000..07ff3df
--- /dev/null
+++ b/package/rrdtool/rrdtool-fix-python-includes.patch
@@ -0,0 +1,29 @@
+Allow to override the python include directories.
+When cross-compiling python extensions, python headers must be taken from the
+staging directory, not the host one.
+
+This patch avoids to run into some weird, ununderstable error about LONG_BIT
+definition, especially when the build and the target machine have different
+bitwises.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+--- rrdtool-1.2.30.orig/acinclude.m4	2012-11-17 11:33:40.194321803 +0100
++++ rrdtool-1.2.30/acinclude.m4	2012-11-17 12:18:12.490326127 +0100
+@@ -467,9 +467,13 @@ AC_MSG_CHECKING(for headers required to
+ dnl deduce PYTHON_INCLUDES
+ py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+ py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+-if test "$py_prefix" != "$py_exec_prefix"; then
+-  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++if test "x$am_cv_python_includes" = "x" ; then
++  PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
++  if test "$py_prefix" != "$py_exec_prefix"; then
++    PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++  fi
++else
++  PYTHON_INCLUDES="-I${am_cv_python_includes}"
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
index 7521aba..8799a85 100644
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -11,8 +11,23 @@ RRDTOOL_AUTORECONF = YES
 RRDTOOL_INSTALL_STAGING = YES
 RRDTOOL_CONF_ENV = rd_cv_ieee_works=yes rd_cv_null_realloc=nope \
 			ac_cv_func_mmap_fixed_mapped=yes
-RRDTOOL_CONF_OPT = --disable-perl --disable-python --disable-ruby \
-			--disable-tcl --program-transform-name=''
+RRDTOOL_CONF_OPT = --program-transform-name='' \
+			--disable-perl \
+			--disable-ruby \
+			--disable-tcl \
+
+ifneq ($(BR2_PACKAGE_RRDTOOL_PYTHON),)
+RRDTOOL_CONF_OPT += --enable-python
+RRDTOOL_CONF_ENV += \
+	am_cv_pathless_PYTHON=python \
+	ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python \
+	am_cv_python_platform=linux2 \
+	am_cv_python_includes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
+RRDTOOL_DEPENDENCIES += python
+else
+RRDTOOL_CONF_OPT += --disable-python
+endif
+
 RRDTOOL_MAKE = $(MAKE1)
 
 define RRDTOOL_REMOVE_EXAMPLES
-- 
1.8.0

[Buildroot] [PATCH 21/33] rrdtool: add python binding support

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

I was about to commit this, but it doesn't work here. I'm doing an ARM
build but get:

building 'rrdtoolmodule' extension
creating build
creating build/temp.linux-x86_64-2.7
/usr/bin/gcc -pthread -fno-strict-aliasing -O2 -I/home/peko/source/buildroot/testrrd/host/usr/include -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes -fPIC -I../../src -I/home/peko/source/buildroot/testrrd/host/usr/include/python2.7 -c rrdtoolmodule.c -o build/temp.linux-x86_64-2.7/rrdtoolmodule.o
rrdtoolmodule.c: In function ?PyRRD_info?:
rrdtoolmodule.c:450:9: warning: implicit declaration of function ?dst_conv? [-Wimplicit-function-declaration]
creating build/lib.linux-x86_64-2.7
/usr/bin/gcc -pthread -shared -L/home/peko/source/buildroot/testrrd/host/lib -L/home/peko/source/buildroot/testrrd/host/usr/lib -Wl,-rpath,/home/peko/source/buildroot/testrrd/host/usr/lib build/temp.linux-x86_64-2.7/rrdtoolmodule.o -L../../src/.libs -L/home/peko/source/buildroot/testrrd/host/usr/lib -Wl,-R/usr/lib -lrrd -lpython2.7 -o build/lib.linux-x86_64-2.7/rrdtoolmodule.so
/usr/bin/ld: skipping incompatible ../../src/.libs/librrd.so when searching for -lrrd
/usr/bin/ld: skipping incompatible ../../src/.libs/librrd.a when searching for -lrrd
/usr/bin/ld: cannot find -lrrd
collect2: error: ld returned 1 exit status

It looks like it's building for the host instead of for the target. Any
ideas?


 Samuel> ---
 Samuel>  package/rrdtool/Config.in                         |  8 +++++++
 Samuel>  package/rrdtool/rrdtool-fix-python-includes.patch | 29 +++++++++++++++++++++++
 Samuel>  package/rrdtool/rrdtool.mk                        | 19 +++++++++++++--
 Samuel>  3 files changed, 54 insertions(+), 2 deletions(-)
 Samuel>  create mode 100644 package/rrdtool/rrdtool-fix-python-includes.patch

 Samuel> diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in
 Samuel> index d315b57..ed3f71e 100644
 Samuel> --- a/package/rrdtool/Config.in
 Samuel> +++ b/package/rrdtool/Config.in
 Samuel> @@ -11,5 +11,13 @@ config BR2_PACKAGE_RRDTOOL
 
 Samuel>  	  http://oss.oetiker.ch/rrdtool/
 
 Samuel> +if BR2_PACKAGE_RRDTOOL
 Samuel> +
 Samuel> +config BR2_PACKAGE_RRDTOOL_PYTHON
 Samuel> +	bool "Python bindings"
 Samuel> +	depends on BR2_PACKAGE_PYTHON
 Samuel> +
 Samuel> +endif
 Samuel> +
 Samuel>  comment "rrdtool requires a toolchain with WCHAR support"
 Samuel>  	depends on !BR2_USE_WCHAR
 Samuel> diff --git a/package/rrdtool/rrdtool-fix-python-includes.patch b/package/rrdtool/rrdtool-fix-python-includes.patch
 Samuel> new file mode 100644
 Samuel> index 0000000..07ff3df
 Samuel> --- /dev/null
 Samuel> +++ b/package/rrdtool/rrdtool-fix-python-includes.patch
 Samuel> @@ -0,0 +1,29 @@
 Samuel> +Allow to override the python include directories.
 Samuel> +When cross-compiling python extensions, python headers must be taken from the
 Samuel> +staging directory, not the host one.
 Samuel> +
 Samuel> +This patch avoids to run into some weird, ununderstable error about LONG_BIT
 Samuel> +definition, especially when the build and the target machine have different
 Samuel> +bitwises.
 Samuel> +
 Samuel> +Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 Samuel> +
 Samuel> +--- rrdtool-1.2.30.orig/acinclude.m4	2012-11-17 11:33:40.194321803 +0100
 Samuel> ++++ rrdtool-1.2.30/acinclude.m4	2012-11-17 12:18:12.490326127 +0100
 Samuel> +@@ -467,9 +467,13 @@ AC_MSG_CHECKING(for headers required to
 Samuel> + dnl deduce PYTHON_INCLUDES
 Samuel> + py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
 Samuel> + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
 Samuel> +-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
 Samuel> +-if test "$py_prefix" != "$py_exec_prefix"; then
 Samuel> +-  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
 Samuel> ++if test "x$am_cv_python_includes" = "x" ; then
 Samuel> ++  PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
 Samuel> ++  if test "$py_prefix" != "$py_exec_prefix"; then
 Samuel> ++    PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
 Samuel> ++  fi
 Samuel> ++else
 Samuel> ++  PYTHON_INCLUDES="-I${am_cv_python_includes}"
 Samuel> + fi
 Samuel> + AC_SUBST(PYTHON_INCLUDES)
 Samuel> + dnl check if the headers exist:
 Samuel> diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
 Samuel> index 7521aba..8799a85 100644
 Samuel> --- a/package/rrdtool/rrdtool.mk
 Samuel> +++ b/package/rrdtool/rrdtool.mk
 Samuel> @@ -11,8 +11,23 @@ RRDTOOL_AUTORECONF = YES
 Samuel>  RRDTOOL_INSTALL_STAGING = YES
 Samuel>  RRDTOOL_CONF_ENV = rd_cv_ieee_works=yes rd_cv_null_realloc=nope \
 Samuel>  			ac_cv_func_mmap_fixed_mapped=yes
 Samuel> -RRDTOOL_CONF_OPT = --disable-perl --disable-python --disable-ruby \
 Samuel> -			--disable-tcl --program-transform-name=''
 Samuel> +RRDTOOL_CONF_OPT = --program-transform-name='' \
 Samuel> +			--disable-perl \
 Samuel> +			--disable-ruby \
 Samuel> +			--disable-tcl \
 Samuel> +
 Samuel> +ifneq ($(BR2_PACKAGE_RRDTOOL_PYTHON),)
 Samuel> +RRDTOOL_CONF_OPT += --enable-python
 Samuel> +RRDTOOL_CONF_ENV += \
 Samuel> +	am_cv_pathless_PYTHON=python \
 Samuel> +	ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python \
 Samuel> +	am_cv_python_platform=linux2 \
 Samuel> +	am_cv_python_includes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
 Samuel> +RRDTOOL_DEPENDENCIES += python
 Samuel> +else
 Samuel> +RRDTOOL_CONF_OPT += --disable-python
 Samuel> +endif
 Samuel> +
 Samuel>  RRDTOOL_MAKE = $(MAKE1)
 
 Samuel>  define RRDTOOL_REMOVE_EXAMPLES
 Samuel> -- 
 Samuel> 1.8.0

 Samuel> _______________________________________________
 Samuel> buildroot mailing list
 Samuel> buildroot at busybox.net
 Samuel> http://lists.busybox.net/mailman/listinfo/buildroot


-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 21/33] rrdtool: add python binding support

[Samuel Martin]

Hi Peter,

2013/1/15 Peter Korsgaard <jacmet@uclibc.org>:
>>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
>
>  Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>
> I was about to commit this, but it doesn't work here. I'm doing an ARM
> build but get:
>
> building 'rrdtoolmodule' extension
> creating build
> creating build/temp.linux-x86_64-2.7
> /usr/bin/gcc -pthread -fno-strict-aliasing -O2 -I/home/peko/source/buildroot/testrrd/host/usr/include -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes -fPIC -I../../src -I/home/peko/source/buildroot/testrrd/host/usr/include/python2.7 -c rrdtoolmodule.c -o build/temp.linux-x86_64-2.7/rrdtoolmodule.o
> rrdtoolmodule.c: In function ?PyRRD_info?:
> rrdtoolmodule.c:450:9: warning: implicit declaration of function ?dst_conv? [-Wimplicit-function-declaration]
> creating build/lib.linux-x86_64-2.7
> /usr/bin/gcc -pthread -shared -L/home/peko/source/buildroot/testrrd/host/lib -L/home/peko/source/buildroot/testrrd/host/usr/lib -Wl,-rpath,/home/peko/source/buildroot/testrrd/host/usr/lib build/temp.linux-x86_64-2.7/rrdtoolmodule.o -L../../src/.libs -L/home/peko/source/buildroot/testrrd/host/usr/lib -Wl,-R/usr/lib -lrrd -lpython2.7 -o build/lib.linux-x86_64-2.7/rrdtoolmodule.so
> /usr/bin/ld: skipping incompatible ../../src/.libs/librrd.so when searching for -lrrd
> /usr/bin/ld: skipping incompatible ../../src/.libs/librrd.a when searching for -lrrd
> /usr/bin/ld: cannot find -lrrd
> collect2: error: ld returned 1 exit status
>
> It looks like it's building for the host instead of for the target. Any
> ideas?
Thanks for the feedback. I'll look into it.

Regards,


-- 
Samuel

[Buildroot] [PATCH 22/33] libmad: add license info

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/libmad/libmad.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index 6999b66..1ce52ec 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -8,6 +8,8 @@ LIBMAD_VERSION = 0.15.1b
 LIBMAD_SITE = http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VERSION)
 LIBMAD_INSTALL_STAGING = YES
 LIBMAD_LIBTOOL_PATCH = NO
+LIBMAD_LICENSE = GPLv2
+LIBMAD_LICENSE_FILES = COPYING
 
 define LIBMAD_PREVENT_AUTOMAKE
 	# Prevent automake from running.
-- 
1.8.0

[Buildroot] [PATCH 22/33] libmad: add license info

[Arnout Vandecappelle]

On 22/11/12 01:18, Samuel Martin wrote:
>
> Signed-off-by: Samuel Martin<s.martin49@gmail.com>
> ---
>   package/libmad/libmad.mk | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
> index 6999b66..1ce52ec 100644
> --- a/package/libmad/libmad.mk
> +++ b/package/libmad/libmad.mk
> @@ -8,6 +8,8 @@ LIBMAD_VERSION = 0.15.1b
>   LIBMAD_SITE = http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VERSION)
>   LIBMAD_INSTALL_STAGING = YES
>   LIBMAD_LIBTOOL_PATCH = NO
> +LIBMAD_LICENSE = GPLv2

  It's GPLv2+


  Regards,
  Arnout

> +LIBMAD_LICENSE_FILES = COPYING
>
>   define LIBMAD_PREVENT_AUTOMAKE
>   	# Prevent automake from running.

-- 
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

[Buildroot] [PATCH 22/33] libmad: add license info

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Committed with the license changed to GPLv2+ as pointed out by Arnout,
thanks both.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 23/33] scons: add license info

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/scons/scons.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index 45f2e1e..92cfe93 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -1,6 +1,9 @@
 SCONS_VERSION = 2.0.1
 SCONS_SOURCE = scons-$(SCONS_VERSION).tar.gz
 SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION)
+SCONS_LICENSE = MIT
+SCONS_LICENSE_FILES = LICENSE.txt
+
 HOST_SCONS_DEPENDENCIES = $(NEED_PYTHON2)
 
 define HOST_SCONS_BUILD_CMDS
-- 
1.8.0

[Buildroot] [PATCH 23/33] scons: add license info

[Arnout Vandecappelle]

On 22/11/12 01:18, Samuel Martin wrote:
>
> Signed-off-by: Samuel Martin<s.martin49@gmail.com>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


  Regards,
  Arnout

> ---
>   package/scons/scons.mk | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/package/scons/scons.mk b/package/scons/scons.mk
> index 45f2e1e..92cfe93 100644
> --- a/package/scons/scons.mk
> +++ b/package/scons/scons.mk
> @@ -1,6 +1,9 @@
>   SCONS_VERSION = 2.0.1
>   SCONS_SOURCE = scons-$(SCONS_VERSION).tar.gz
>   SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION)
> +SCONS_LICENSE = MIT
> +SCONS_LICENSE_FILES = LICENSE.txt
> +
>   HOST_SCONS_DEPENDENCIES = $(NEED_PYTHON2)
>
>   define HOST_SCONS_BUILD_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

[Buildroot] [PATCH 23/33] scons: add license info

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 24/33] efl packages: add license info

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/efl/expedite/expedite.mk           | 3 +++
 package/efl/libecore/libecore.mk           | 3 +++
 package/efl/libedbus/libedbus.mk           | 3 +++
 package/efl/libedje/libedje.mk             | 3 +++
 package/efl/libeet/libeet.mk               | 3 +++
 package/efl/libefreet/libefreet.mk         | 3 +++
 package/efl/libeina/libeina.mk             | 3 +++
 package/efl/libelementary/libelementary.mk | 3 +++
 package/efl/libembryo/libembryo.mk         | 3 +++
 package/efl/libethumb/libethumb.mk         | 3 +++
 package/efl/libevas/libevas.mk             | 3 +++
 11 files changed, 33 insertions(+)

diff --git a/package/efl/expedite/expedite.mk b/package/efl/expedite/expedite.mk
index a841ac9..26d25f5 100644
--- a/package/efl/expedite/expedite.mk
+++ b/package/efl/expedite/expedite.mk
@@ -6,6 +6,9 @@
 
 EXPEDITE_VERSION = 1.1.0
 EXPEDITE_SITE = http://download.enlightenment.org/releases/
+EXPEDITE_LICENSE = BSD-2c
+EXPEDITE_LICENSE_FILES = COPYING
+
 EXPEDITE_DEPENDENCIES = libevas libeina libeet
 
 $(eval $(autotools-package))
diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index b495bdb..9eb09ac 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -7,6 +7,9 @@
 LIBECORE_VERSION = 1.1.0
 LIBECORE_SOURCE = ecore-$(LIBECORE_VERSION).tar.bz2
 LIBECORE_SITE = http://download.enlightenment.org/releases/
+LIBECORE_LICENSE = BSD-2c
+LIBECORE_LICENSE_FILES = COPYING
+
 LIBECORE_INSTALL_STAGING = YES
 
 LIBECORE_DEPENDENCIES = host-pkgconf libeina
diff --git a/package/efl/libedbus/libedbus.mk b/package/efl/libedbus/libedbus.mk
index 4ecb0f8..60651e3 100644
--- a/package/efl/libedbus/libedbus.mk
+++ b/package/efl/libedbus/libedbus.mk
@@ -7,6 +7,9 @@
 LIBEDBUS_VERSION = 1.1.0
 LIBEDBUS_SOURCE = e_dbus-$(LIBEDBUS_VERSION).tar.bz2
 LIBEDBUS_SITE = http://download.enlightenment.org/releases/
+LIBEDBUS_LICENSE = BSD-2c
+LIBEDBUS_LICENSE_FILES = COPYING
+
 LIBEDBUS_INSTALL_STAGING = YES
 
 LIBEDBUS_DEPENDENCIES = host-pkgconf dbus libeina libecore
diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
index 8b4814e..f768dba 100644
--- a/package/efl/libedje/libedje.mk
+++ b/package/efl/libedje/libedje.mk
@@ -7,6 +7,9 @@
 LIBEDJE_VERSION = 1.1.0
 LIBEDJE_SOURCE = edje-$(LIBEDJE_VERSION).tar.bz2
 LIBEDJE_SITE =  http://download.enlightenment.org/releases/
+LIBEDJE_LICENSE = epp binary is licensed under GPLv2, everything else is licensed under BSD-2c
+LIBEDJE_LICENSE_FILES = COPYING
+
 LIBEDJE_INSTALL_STAGING = YES
 
 LIBEDJE_DEPENDENCIES = host-pkgconf lua libeina libeet libecore libevas \
diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
index cb64675..ccb3501 100644
--- a/package/efl/libeet/libeet.mk
+++ b/package/efl/libeet/libeet.mk
@@ -7,6 +7,9 @@
 LIBEET_VERSION = 1.5.0
 LIBEET_SOURCE = eet-$(LIBEET_VERSION).tar.bz2
 LIBEET_SITE = http://download.enlightenment.org/releases/
+LIBEET_LICENSE = BSD-2c
+LIBEET_LICENSE_FILES = COPYING
+
 LIBEET_INSTALL_STAGING = YES
 
 LIBEET_DEPENDENCIES = host-pkgconf zlib jpeg libeina
diff --git a/package/efl/libefreet/libefreet.mk b/package/efl/libefreet/libefreet.mk
index 2f00bcf..c0d7397 100644
--- a/package/efl/libefreet/libefreet.mk
+++ b/package/efl/libefreet/libefreet.mk
@@ -7,6 +7,9 @@
 LIBEFREET_VERSION = 1.1.0
 LIBEFREET_SOURCE = efreet-$(LIBEFREET_VERSION).tar.bz2
 LIBEFREET_SITE = http://download.enlightenment.org/releases/
+LIBEFREET_LICENSE = BSD-2c
+LIBEFREET_LICENSE_FILES = COPYING
+
 LIBEFREET_INSTALL_STAGING = YES
 
 LIBEFREET_DEPENDENCIES = libeina libeet libecore
diff --git a/package/efl/libeina/libeina.mk b/package/efl/libeina/libeina.mk
index 465fee1..e5b89c1 100644
--- a/package/efl/libeina/libeina.mk
+++ b/package/efl/libeina/libeina.mk
@@ -7,6 +7,9 @@
 LIBEINA_VERSION = 1.1.0
 LIBEINA_SOURCE = eina-$(LIBEINA_VERSION).tar.bz2
 LIBEINA_SITE = http://download.enlightenment.org/releases/
+LIBEINA_LICENSE = LGPLv2.1+
+LIBEINA_LICENSE_FILES = COPYING
+
 LIBEINA_INSTALL_STAGING = YES
 
 LIBEINA_DEPENDENCIES = host-pkgconf
diff --git a/package/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk
index 83c9005..8957d03 100644
--- a/package/efl/libelementary/libelementary.mk
+++ b/package/efl/libelementary/libelementary.mk
@@ -7,6 +7,9 @@
 LIBELEMENTARY_VERSION = 0.8.0.65643
 LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.bz2
 LIBELEMENTARY_SITE = http://download.enlightenment.org/snapshots/2011-11-28
+LIBELEMENTARY_LICENSE = LGPLv2.1
+LIBELEMENTARY_LICENSE_FILES = COPYING
+
 LIBELEMENTARY_INSTALL_STAGING = YES
 
 LIBELEMENTARY_DEPENDENCIES = libeina libevas libecore libedje host-libedje \
diff --git a/package/efl/libembryo/libembryo.mk b/package/efl/libembryo/libembryo.mk
index 5484ccf..6f66b10 100644
--- a/package/efl/libembryo/libembryo.mk
+++ b/package/efl/libembryo/libembryo.mk
@@ -7,6 +7,9 @@
 LIBEMBRYO_VERSION = 1.1.0
 LIBEMBRYO_SOURCE = embryo-$(LIBEMBRYO_VERSION).tar.bz2
 LIBEMBRYO_SITE = http://download.enlightenment.org/releases/
+LIBEMBRYO_LICENSE = source containing the ITB CompuPhase copyright are released as-is  and the others are licensed under BSD-2c
+LIBEMBRYO_LICENSE_FILES = COPYING
+
 LIBEMBRYO_INSTALL_STAGING = YES
 
 LIBEMBRYO_DEPENDENCIES = host-pkgconf libeina
diff --git a/package/efl/libethumb/libethumb.mk b/package/efl/libethumb/libethumb.mk
index 92e4c83..785fb28 100644
--- a/package/efl/libethumb/libethumb.mk
+++ b/package/efl/libethumb/libethumb.mk
@@ -7,6 +7,9 @@
 LIBETHUMB_VERSION = 0.1.1.65643
 LIBETHUMB_SOURCE = ethumb-$(LIBETHUMB_VERSION).tar.bz2
 LIBETHUMB_SITE = http://download.enlightenment.org/snapshots/2011-11-28
+LIBETHUMB_LICENSE = LGPLv2.1
+LIBETHUMB_LICENSE_FILES = COPYING
+
 LIBETHUMB_INSTALL_STAGING = YES
 
 LIBETHUMB_DEPENDENCIES = libeina libevas libecore libedje host-libedje
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
index 594db60..402aa48 100644
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -7,6 +7,9 @@
 LIBEVAS_VERSION = 1.1.0
 LIBEVAS_SOURCE = evas-$(LIBEVAS_VERSION).tar.bz2
 LIBEVAS_SITE = http://download.enlightenment.org/releases/
+LIBEVAS_LICENSE = BSD-2c
+LIBEVAS_LICENSE_FILES = COPYING
+
 LIBEVAS_INSTALL_STAGING = YES
 
 LIBEVAS_DEPENDENCIES = host-pkgconf zlib libeina freetype
-- 
1.8.0

[Buildroot] [PATCH 24/33] efl packages: add license info

[Arnout Vandecappelle]

On 22/11/12 01:18, Samuel Martin wrote:
>
> Signed-off-by: Samuel Martin<s.martin49@gmail.com>
[snip]
> diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
> index 8b4814e..f768dba 100644
> --- a/package/efl/libedje/libedje.mk
> +++ b/package/efl/libedje/libedje.mk
> @@ -7,6 +7,9 @@
>   LIBEDJE_VERSION = 1.1.0
>   LIBEDJE_SOURCE = edje-$(LIBEDJE_VERSION).tar.bz2
>   LIBEDJE_SITE =  http://download.enlightenment.org/releases/
> +LIBEDJE_LICENSE = epp binary is licensed under GPLv2, everything else is licensed under BSD-2c

  Although I'm OK with verbose license text, I think this is a bit too much.
How about: "GPLv2+ (epp binary), BSD-2c (everything else)"

  Note that it's GPLv2+

> +LIBEDJE_LICENSE_FILES = COPYING
> +
>   LIBEDJE_INSTALL_STAGING = YES
>
>   LIBEDJE_DEPENDENCIES = host-pkgconf lua libeina libeet libecore libevas \
[snip]
> diff --git a/package/efl/libembryo/libembryo.mk b/package/efl/libembryo/libembryo.mk
> index 5484ccf..6f66b10 100644
> --- a/package/efl/libembryo/libembryo.mk
> +++ b/package/efl/libembryo/libembryo.mk
> @@ -7,6 +7,9 @@
>   LIBEMBRYO_VERSION = 1.1.0
>   LIBEMBRYO_SOURCE = embryo-$(LIBEMBRYO_VERSION).tar.bz2
>   LIBEMBRYO_SITE = http://download.enlightenment.org/releases/
> +LIBEMBRYO_LICENSE = source containing the ITB CompuPhase copyright are released as-is  and the others are licensed under BSD-2c

  Again a bit too verbose.  I think the following should be sufficient:
"BSD-2c, Embryo license"

> +LIBEMBRYO_LICENSE_FILES = COPYING
> +
>   LIBEMBRYO_INSTALL_STAGING = YES
>
>   LIBEMBRYO_DEPENDENCIES = host-pkgconf libeina
> diff --git a/package/efl/libethumb/libethumb.mk b/package/efl/libethumb/libethumb.mk
> index 92e4c83..785fb28 100644
> --- a/package/efl/libethumb/libethumb.mk
> +++ b/package/efl/libethumb/libethumb.mk
> @@ -7,6 +7,9 @@
>   LIBETHUMB_VERSION = 0.1.1.65643
>   LIBETHUMB_SOURCE = ethumb-$(LIBETHUMB_VERSION).tar.bz2
>   LIBETHUMB_SITE = http://download.enlightenment.org/snapshots/2011-11-28
> +LIBETHUMB_LICENSE = LGPLv2.1

  LGPLv2.1+


  Regards,
  Arnout

> +LIBETHUMB_LICENSE_FILES = COPYING
> +
>   LIBETHUMB_INSTALL_STAGING = YES
>
>   LIBETHUMB_DEPENDENCIES = libeina libevas libecore libedje host-libedje
> diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
> index 594db60..402aa48 100644
> --- a/package/efl/libevas/libevas.mk
> +++ b/package/efl/libevas/libevas.mk
> @@ -7,6 +7,9 @@
>   LIBEVAS_VERSION = 1.1.0
>   LIBEVAS_SOURCE = evas-$(LIBEVAS_VERSION).tar.bz2
>   LIBEVAS_SITE = http://download.enlightenment.org/releases/
> +LIBEVAS_LICENSE = BSD-2c
> +LIBEVAS_LICENSE_FILES = COPYING
> +
>   LIBEVAS_INSTALL_STAGING = YES
>
>   LIBEVAS_DEPENDENCIES = host-pkgconf zlib libeina freetype

-- 
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

[Buildroot] [PATCH 25/33] fluxbox: add license info

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/fluxbox/fluxbox.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
index bb34379..d8f2723 100644
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -7,6 +7,9 @@
 FLUXBOX_VERSION = 1.3.2
 FLUXBOX_SOURCE = fluxbox-$(FLUXBOX_VERSION).tar.bz2
 FLUXBOX_SITE = http://downloads.sourceforge.net/project/fluxbox/fluxbox/$(FLUXBOX_VERSION)
+FLUXBOX_LICENSE = as-is
+FLUXBOX_LICENSE_FILES = COPYING
+
 FLUXBOX_AUTORECONF = YES
 FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 		   --x-libraries=$(STAGING_DIR)/usr/lib \
-- 
1.8.0

[Buildroot] [PATCH 25/33] fluxbox: add license info

[Arnout Vandecappelle]

On 22/11/12 01:18, Samuel Martin wrote:
>
> Signed-off-by: Samuel Martin<s.martin49@gmail.com>
> ---
>   package/fluxbox/fluxbox.mk | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
> index bb34379..d8f2723 100644
> --- a/package/fluxbox/fluxbox.mk
> +++ b/package/fluxbox/fluxbox.mk
> @@ -7,6 +7,9 @@
>   FLUXBOX_VERSION = 1.3.2
>   FLUXBOX_SOURCE = fluxbox-$(FLUXBOX_VERSION).tar.bz2
>   FLUXBOX_SITE = http://downloads.sourceforge.net/project/fluxbox/fluxbox/$(FLUXBOX_VERSION)
> +FLUXBOX_LICENSE = as-is
> +FLUXBOX_LICENSE_FILES = COPYING
> +

  It's a MIT license.


  Regards,
  Arnout

>   FLUXBOX_AUTORECONF = YES
>   FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
>   		   --x-libraries=$(STAGING_DIR)/usr/lib \

-- 
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

[Buildroot] [PATCH 26/33] igh-ethercat: add license info

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/igh-ethercat/igh-ethercat.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk
index 9182f76..d37b6d3 100644
--- a/package/igh-ethercat/igh-ethercat.mk
+++ b/package/igh-ethercat/igh-ethercat.mk
@@ -1,6 +1,10 @@
 IGH_ETHERCAT_VERSION = 1.5.1
 IGH_ETHERCAT_SITE    = http://etherlab.org/download/ethercat/
 IGH_ETHERCAT_SOURCE  = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
+# According to the README file IgH EtherCAT master is licensed under GPLv2,
+# while the source-tree contains a copy of the GPLv2 and one of the LGPLv3
+IGH_ETHERCAT_LICENSE = GPLv2
+IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER
 
 IGH_ETHERCAT_DEPENDENCIES    = linux
 IGH_ETHERCAT_INSTALL_STAGING = YES
-- 
1.8.0

[Buildroot] [PATCH 26/33] igh-ethercat: add license info

[Arnout Vandecappelle]

On 22/11/12 01:18, Samuel Martin wrote:
>
> Signed-off-by: Samuel Martin<s.martin49@gmail.com>
> ---
>   package/igh-ethercat/igh-ethercat.mk | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk
> index 9182f76..d37b6d3 100644
> --- a/package/igh-ethercat/igh-ethercat.mk
> +++ b/package/igh-ethercat/igh-ethercat.mk
> @@ -1,6 +1,10 @@
>   IGH_ETHERCAT_VERSION = 1.5.1
>   IGH_ETHERCAT_SITE    = http://etherlab.org/download/ethercat/
>   IGH_ETHERCAT_SOURCE  = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
> +# According to the README file IgH EtherCAT master is licensed under GPLv2,
> +# while the source-tree contains a copy of the GPLv2 and one of the LGPLv3
> +IGH_ETHERCAT_LICENSE = GPLv2
> +IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER

  The library is under LGPLv2.1. I guess they included the LGPLv3 by
accident.


  Regards,
  Arnout

>
>   IGH_ETHERCAT_DEPENDENCIES    = linux
>   IGH_ETHERCAT_INSTALL_STAGING = YES

-- 
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

[Buildroot] [PATCH 27/33] imagemagick: add license info

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/imagemagick/imagemagick.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 365a073..725e529 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -11,6 +11,9 @@ IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
 # available, which is annoying. Use an alternate site that keeps all
 # older versions.
 IMAGEMAGICK_SITE = ftp://ftp.nluug.nl/pub/ImageMagick/
+IMAGEMAGICK_LICENSE = Apache-v2
+IMAGEMAGICK_LICENSE_FILES = LICENSE
+
 IMAGEMAGICK_INSTALL_STAGING = YES
 IMAGEMAGICK_AUTORECONF = YES
 
-- 
1.8.0

[Buildroot] [PATCH 27/33] imagemagick: add license info

[Arnout Vandecappelle]

On 22/11/12 01:18, Samuel Martin wrote:
>
> Signed-off-by: Samuel Martin<s.martin49@gmail.com>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

  Regards,
  Arnout

> ---
>   package/imagemagick/imagemagick.mk | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
> index 365a073..725e529 100644
> --- a/package/imagemagick/imagemagick.mk
> +++ b/package/imagemagick/imagemagick.mk
> @@ -11,6 +11,9 @@ IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
>   # available, which is annoying. Use an alternate site that keeps all
>   # older versions.
>   IMAGEMAGICK_SITE = ftp://ftp.nluug.nl/pub/ImageMagick/
> +IMAGEMAGICK_LICENSE = Apache-v2
> +IMAGEMAGICK_LICENSE_FILES = LICENSE
> +
>   IMAGEMAGICK_INSTALL_STAGING = YES
>   IMAGEMAGICK_AUTORECONF = YES
>

-- 
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

[Buildroot] [PATCH 27/33] imagemagick: add license info

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 28/33] imlib2: add license info

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/imlib2/imlib2.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
index 3c6c473..52d80df 100644
--- a/package/imlib2/imlib2.mk
+++ b/package/imlib2/imlib2.mk
@@ -6,6 +6,9 @@
 IMLIB2_VERSION = 1.4.5
 IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2
 IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)/
+IMLIB2_LICENSE = as-is
+IMLIB2_LICENSE_FILES = COPYING
+
 IMLIB2_INSTALL_STAGING = YES
 IMLIB2_DEPENDENCIES = host-pkgconf freetype
 IMLIB2_CONF_OPT = --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
@@ -61,4 +64,3 @@ endef
 IMLIB2_POST_INSTALL_STAGING_HOOKS += IMLIB2_FIXUP_IMLIB2_CONFIG
 
 $(eval $(autotools-package))
-
-- 
1.8.0

[Buildroot] [PATCH 28/33] imlib2: add license info

[Arnout Vandecappelle]

On 22/11/12 01:18, Samuel Martin wrote:
>
> Signed-off-by: Samuel Martin<s.martin49@gmail.com>
> ---
>   package/imlib2/imlib2.mk | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
> index 3c6c473..52d80df 100644
> --- a/package/imlib2/imlib2.mk
> +++ b/package/imlib2/imlib2.mk
> @@ -6,6 +6,9 @@
>   IMLIB2_VERSION = 1.4.5
>   IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2
>   IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)/
> +IMLIB2_LICENSE = as-is
> +IMLIB2_LICENSE_FILES = COPYING

  I think we'll have to call this 'imlib2 license'.  'as-is' is too meaningless
if you ask me.  The license resembles MIT a bit, but the requirement of public
acknowledgement diverges too much to still call it MIT-like.

  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

[Buildroot] [PATCH 29/33] ltp-testsuite: add license info

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/ltp-testsuite/ltp-testsuite.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index c6b34f0..72d3a08 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -6,5 +6,7 @@
 LTP_TESTSUITE_VERSION = 20101031
 LTP_TESTSUITE_SOURCE  = ltp-full-$(LTP_TESTSUITE_VERSION).bz2
 LTP_TESTSUITE_SITE    = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION)
+LTP_TESTSUITE_LICENSE = GPLv2
+LTP_TESTSUITE_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
-- 
1.8.0

[Buildroot] [PATCH 29/33] ltp-testsuite: add license info

[Arnout Vandecappelle]

On 22/11/12 01:18, Samuel Martin wrote:
>
> Signed-off-by: Samuel Martin<s.martin49@gmail.com>
> ---
>   package/ltp-testsuite/ltp-testsuite.mk | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
> index c6b34f0..72d3a08 100644
> --- a/package/ltp-testsuite/ltp-testsuite.mk
> +++ b/package/ltp-testsuite/ltp-testsuite.mk
> @@ -6,5 +6,7 @@
>   LTP_TESTSUITE_VERSION = 20101031
>   LTP_TESTSUITE_SOURCE  = ltp-full-$(LTP_TESTSUITE_VERSION).bz2
>   LTP_TESTSUITE_SITE    = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION)
> +LTP_TESTSUITE_LICENSE = GPLv2
> +LTP_TESTSUITE_LICENSE_FILES = COPYING

  Parts are GPLv2 and parts are GPLv2+, so I'd put both.

  Regards,
  Arnout

>
>   $(eval $(autotools-package))

-- 
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

[Buildroot] [PATCH 29/33] ltp-testsuite: add license info

[Peter Korsgaard]

>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Committed with 'GPLv2 GPLv2+' as pointed out by Arnout.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 30/33] matchbox packages: add license info

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/matchbox/matchbox-common/matchbox-common.mk                   | 3 +++
 package/matchbox/matchbox-desktop/matchbox-desktop.mk                 | 3 +++
 package/matchbox/matchbox-fakekey/matchbox-fakekey.mk                 | 3 +++
 package/matchbox/matchbox-keyboard/matchbox-keyboard.mk               | 3 +++
 package/matchbox/matchbox-lib/matchbox-lib.mk                         | 3 +++
 package/matchbox/matchbox-panel/matchbox-panel.mk                     | 3 +++
 package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk | 3 +++
 package/matchbox/matchbox-wm/matchbox-wm.mk                           | 3 +++
 8 files changed, 24 insertions(+)

diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
index 993590c..2909f27 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -7,6 +7,9 @@ MATCHBOX_COMMON_VERSION_MAJOR = 0.9
 MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1
 MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2
 MATCHBOX_COMMON_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR)
+MATCHBOX_COMMON_LICENSE = GPLv2
+MATCHBOX_COMMON_LICENSE_FILES = COPYING
+
 MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib
 
 ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y)
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index c5f5b0d..b1d0976 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -8,6 +8,9 @@ MATCHBOX_DESKTOP_VERSION_MAJOR = 0.9
 MATCHBOX_DESKTOP_VERSION = $(MATCHBOX_DESKTOP_VERSION_MAJOR).1
 MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2
 MATCHBOX_DESKTOP_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR)
+MATCHBOX_DESKTOP_LICENSE = GPLv2
+MATCHBOX_DESKTOP_LICENSE_FILES = COPYING
+
 MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib
 MATCHBOX_DESKTOP_CONF_OPT = --enable-expat
 
diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
index 255f3c1..763ea6f 100644
--- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
+++ b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
@@ -7,6 +7,9 @@
 MATCHBOX_FAKEKEY_VERSION = 0.1
 MATCHBOX_FAKEKEY_SOURCE = libfakekey-$(MATCHBOX_FAKEKEY_VERSION).tar.bz2
 MATCHBOX_FAKEKEY_SITE = http://matchbox-project.org/sources/libfakekey/$(MATCHBOX_FAKEKEY_VERSION)
+MATCHBOX_FAKEKEY_LICENSE = GPLv2
+MATCHBOX_FAKEKEY_LICENSE_FILES = COPYING
+
 MATCHBOX_FAKEKEY_INSTALL_STAGING = YES
 MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
 MATCHBOX_FAKEKEY_CONF_OPT = --enable-expat
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index 2da8dfa..5eb2cf3 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -7,6 +7,9 @@
 MATCHBOX_KEYBOARD_VERSION = 0.1
 MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2
 MATCHBOX_KEYBOARD_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
+MATCHBOX_KEYBOARD_LICENSE = GPLv2
+MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING
+
 MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey
 
 # Workaround bug in configure script
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index c9d7600..3b1b2e1 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -7,6 +7,9 @@
 MATCHBOX_LIB_VERSION = 1.9
 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
 MATCHBOX_LIB_SITE = http://projects.o-hand.com/matchbox/sources/libmatchbox/$(MATCHBOX_LIB_VERSION)
+MATCHBOX_LIB_LICENSE = LGPLv2.1
+MATCHBOX_LIB_LICENSE_FILES = COPYING
+
 MATCHBOX_LIB_INSTALL_STAGING = YES
 MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
 MATCHBOX_LIB_CONF_OPT = --enable-expat --disable-doxygen-docs
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index e216fed..8cb59db 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -7,6 +7,9 @@ MATCHBOX_PANEL_VERSION_MAJOR = 0.9
 MATCHBOX_PANEL_VERSION = $(MATCHBOX_PANEL_VERSION_MAJOR).3
 MATCHBOX_PANEL_SOURCE = matchbox-panel-$(MATCHBOX_PANEL_VERSION).tar.bz2
 MATCHBOX_PANEL_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-panel/$(MATCHBOX_PANEL_VERSION_MAJOR)
+MATCHBOX_PANEL_LICENSE = GPLv2
+MATCHBOX_PANEL_LICENSE_FILES = COPYING
+
 MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib
 MATCHBOX_PANEL_CONF_OPT = --enable-expat
 
diff --git a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
index 6f37bf4..2d8287b 100644
--- a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
+++ b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
@@ -7,6 +7,9 @@
 MATCHBOX_STARTUP_MONITOR_VERSION = 0.1
 MATCHBOX_STARTUP_MONITOR_SOURCE = mb-applet-startup-monitor-$(MATCHBOX_STARTUP_MONITOR_VERSION).tar.bz2
 MATCHBOX_STARTUP_MONITOR_SITE = http://matchbox-project.org/sources/mb-applet-startup-monitor/$(MATCHBOX_STARTUP_MONITOR_VERSION)
+MATCHBOX_STARTUP_MONITOR_LICENSE = GPLv2
+MATCHBOX_STARTUP_MONITOR_LICENSE_FILES = COPYING
+
 MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification
 MATCHBOX_STARTUP_MONITOR_CONF_OPT =
 
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
index 1a07a58..3d4da78 100644
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
@@ -7,6 +7,9 @@
 MATCHBOX_WM_VERSION = 1.2
 MATCHBOX_WM_SOURCE = matchbox-window-manager-$(MATCHBOX_WM_VERSION).tar.bz2
 MATCHBOX_WM_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/$(MATCHBOX_WM_VERSION)
+MATCHBOX_WM_LICENSE = GPLv2
+MATCHBOX_WM_LICENSE_FILES = COPYING
+
 MATCHBOX_WM_DEPENDENCIES = matchbox-lib
 MATCHBOX_WM_CONF_OPT = --enable-expat
 
-- 
1.8.0

[Buildroot] [PATCH 30/33] matchbox packages: add license info

[Arnout Vandecappelle]

On 22/11/12 01:18, Samuel Martin wrote:
>
> Signed-off-by: Samuel Martin<s.martin49@gmail.com>
> ---
>   package/matchbox/matchbox-common/matchbox-common.mk                   | 3 +++
>   package/matchbox/matchbox-desktop/matchbox-desktop.mk                 | 3 +++
>   package/matchbox/matchbox-fakekey/matchbox-fakekey.mk                 | 3 +++
>   package/matchbox/matchbox-keyboard/matchbox-keyboard.mk               | 3 +++
>   package/matchbox/matchbox-lib/matchbox-lib.mk                         | 3 +++
>   package/matchbox/matchbox-panel/matchbox-panel.mk                     | 3 +++
>   package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk | 3 +++
>   package/matchbox/matchbox-wm/matchbox-wm.mk                           | 3 +++
>   8 files changed, 24 insertions(+)
>
> diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
> index 993590c..2909f27 100644
> --- a/package/matchbox/matchbox-common/matchbox-common.mk
> +++ b/package/matchbox/matchbox-common/matchbox-common.mk
> @@ -7,6 +7,9 @@ MATCHBOX_COMMON_VERSION_MAJOR = 0.9
>   MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1
>   MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2
>   MATCHBOX_COMMON_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR)
> +MATCHBOX_COMMON_LICENSE = GPLv2

  As far as I can see, all files say 'or later', so it should
be GPLv2+.  And this is for all matchbox-xxx packages.

  Regards,
  Arnout

[snip]
-- 
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

[Buildroot] [PATCH 31/33] owl-linux: add license info

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/owl-linux/owl-linux.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/owl-linux/owl-linux.mk b/package/owl-linux/owl-linux.mk
index 0a111c8..e5846a4 100644
--- a/package/owl-linux/owl-linux.mk
+++ b/package/owl-linux/owl-linux.mk
@@ -5,6 +5,8 @@
 #############################################################
 OWL_LINUX_VERSION = 1.0.7
 OWL_LINUX_SITE = http://linux.hd-wireless.se/pub/Linux/DownloadDrivers
+OWL_LINUX_LICENSE = as-is
+OWL_LINUX_LICENSE_FILES = LICENSE
 
 OWL_LINUX_DEPENDENCIES = linux
 
-- 
1.8.0

[Buildroot] [PATCH 31/33] owl-linux: add license info

[Arnout Vandecappelle]

On 22/11/12 01:18, Samuel Martin wrote:
>
> Signed-off-by: Samuel Martin<s.martin49@gmail.com>
> ---
>   package/owl-linux/owl-linux.mk | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/package/owl-linux/owl-linux.mk b/package/owl-linux/owl-linux.mk
> index 0a111c8..e5846a4 100644
> --- a/package/owl-linux/owl-linux.mk
> +++ b/package/owl-linux/owl-linux.mk
> @@ -5,6 +5,8 @@
>   #############################################################
>   OWL_LINUX_VERSION = 1.0.7
>   OWL_LINUX_SITE = http://linux.hd-wireless.se/pub/Linux/DownloadDrivers
> +OWL_LINUX_LICENSE = as-is
> +OWL_LINUX_LICENSE_FILES = LICENSE

  The way I read this license, it's PROPRIETARY.  The 'as-is' is just a
warranty disclaimer.  The only reference to copyright is "All rights
reserved" - i.e., you're not allowed to copy it (or even compile it).

  This means you should also set OWL_LINUX_REDISTRIBUTE = NO.

  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

[Buildroot] [PATCH 32/33] rrdtool: add license info

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/rrdtool/rrdtool.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
index 8799a85..4392b50 100644
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -6,6 +6,9 @@
 
 RRDTOOL_VERSION = 1.2.30
 RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub
+RRDTOOL_LICENSE = GPLv2+ with FLOSS license exceptions as explained in COPYRIGHT
+RRDTOOL_LICENSE_FILES = COPYING
+
 RRDTOOL_DEPENDENCIES = host-pkgconf freetype libart libpng zlib
 RRDTOOL_AUTORECONF = YES
 RRDTOOL_INSTALL_STAGING = YES
-- 
1.8.0

[Buildroot] [PATCH 32/33] rrdtool: add license info

[Baruch Siach]

Hi Samuel,

On Thu, Nov 22, 2012 at 01:18:22AM +0100, Samuel Martin wrote:
> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
>  package/rrdtool/rrdtool.mk | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
> index 8799a85..4392b50 100644
> --- a/package/rrdtool/rrdtool.mk
> +++ b/package/rrdtool/rrdtool.mk
> @@ -6,6 +6,9 @@
>  
>  RRDTOOL_VERSION = 1.2.30
>  RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub
> +RRDTOOL_LICENSE = GPLv2+ with FLOSS license exceptions as explained in COPYRIGHT
> +RRDTOOL_LICENSE_FILES = COPYING

Shouldn't COPYRIGHT also be listed with the license files?

baruch

> +
>  RRDTOOL_DEPENDENCIES = host-pkgconf freetype libart libpng zlib
>  RRDTOOL_AUTORECONF = YES
>  RRDTOOL_INSTALL_STAGING = YES

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH 32/33] rrdtool: add license info

[Samuel Martin]

Hi Baruch, all,

2012/11/22 Baruch Siach <baruch@tkos.co.il>:
> Hi Samuel,
>
> On Thu, Nov 22, 2012 at 01:18:22AM +0100, Samuel Martin wrote:
>>
>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> ---
>>  package/rrdtool/rrdtool.mk | 3 +++
>>  1 file changed, 3 insertions(+)
>>
>> diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
>> index 8799a85..4392b50 100644
>> --- a/package/rrdtool/rrdtool.mk
>> +++ b/package/rrdtool/rrdtool.mk
>> @@ -6,6 +6,9 @@
>>
>>  RRDTOOL_VERSION = 1.2.30
>>  RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub
>> +RRDTOOL_LICENSE = GPLv2+ with FLOSS license exceptions as explained in COPYRIGHT
>> +RRDTOOL_LICENSE_FILES = COPYING
>
> Shouldn't COPYRIGHT also be listed with the license files?
The Copyright file just tells us "wrt the license, you can do that and
that, but not that with this software",
with some real use case.

Shall we consider as part of the license files?

Regards,


-- 
Sam

[Buildroot] [PATCH 32/33] rrdtool: add license info

[Arnout Vandecappelle]

On 22/11/12 11:07, Samuel Martin wrote:
> Hi Baruch, all,
>
> 2012/11/22 Baruch Siach<baruch@tkos.co.il>:
> > Hi Samuel,
> >
> > On Thu, Nov 22, 2012 at 01:18:22AM +0100, Samuel Martin wrote:
> >>
> >> Signed-off-by: Samuel Martin<s.martin49@gmail.com>
> >> ---
> >>   package/rrdtool/rrdtool.mk | 3 +++
> >>   1 file changed, 3 insertions(+)
> >>
> >> diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
> >> index 8799a85..4392b50 100644
> >> --- a/package/rrdtool/rrdtool.mk
> >> +++ b/package/rrdtool/rrdtool.mk
> >> @@ -6,6 +6,9 @@
> >>
> >>   RRDTOOL_VERSION = 1.2.30
> >>   RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub
> >> +RRDTOOL_LICENSE = GPLv2+ with FLOSS license exceptions as explained in COPYRIGHT
> >> +RRDTOOL_LICENSE_FILES = COPYING
> >
> > Shouldn't COPYRIGHT also be listed with the license files?
> The Copyright file just tells us "wrt the license, you can do that and
> that, but not that with this software",
> with some real use case.
>
> Shall we consider as part of the license files?

  Since you refer to it in the RRDTOOL_LICENSE, yes the COPYRIGHT file
should be included.

  Note that "GPLv2+ with exceptions" is probably enough, since the
user should anyway look at COPYRIGHT to find out the details.

  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

[Buildroot] [PATCH 33/33] sylpheed: add license info

[Samuel Martin]

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/sylpheed/sylpheed.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index 3ac2e1e..149c2a3 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -8,6 +8,8 @@ SYLPHEED_VERSION_MINOR = 0
 SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR)
 SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
 SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
+SYLPHEED_LICENSE = GPLv2, except the libraries which are released under LGPLv2.1
+SYLPHEED_LICENSE_FILES = COPIYNG COPYING.LIB
 
 SYLPHEED_CONF_OPT = --disable-gtkspell --disable-gpgme
 
-- 
1.8.0

[Buildroot] [PATCH 33/33] sylpheed: add license info

[Arnout Vandecappelle]

On 22/11/12 01:18, Samuel Martin wrote:
>
> Signed-off-by: Samuel Martin<s.martin49@gmail.com>
> ---
>   package/sylpheed/sylpheed.mk | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
> index 3ac2e1e..149c2a3 100644
> --- a/package/sylpheed/sylpheed.mk
> +++ b/package/sylpheed/sylpheed.mk
> @@ -8,6 +8,8 @@ SYLPHEED_VERSION_MINOR = 0
>   SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR)
>   SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
>   SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
> +SYLPHEED_LICENSE = GPLv2, except the libraries which are released under LGPLv2.1

  Both of them are +, so: GPLv2+ (executables), LGPLv2.1+ (library, attachment plugin)


  Regards,
  Arnout

> +SYLPHEED_LICENSE_FILES = COPIYNG COPYING.LIB
>
>   SYLPHEED_CONF_OPT = --disable-gtkspell --disable-gpgme
>

-- 
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