From cbb3cb3beb773d8bd7d25e0e3959a22fefe1c586 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 14 Nov 2014 14:52:59 +0100 Subject: [PATCH 001/105] Kickoff 2015.02 cycle Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 471edf910..fd62aae45 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ all: # Set and export the version string -export BR2_VERSION := 2014.11-rc1 +export BR2_VERSION := 2015.02-git # Check for minimal make version (note: this check will break at make 10.x) MIN_MAKE_VERSION = 3.81 From 76246491fe0a5f4ab4d7f5c2f7bcc56ec8c44214 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 13 Nov 2014 17:38:55 +0000 Subject: [PATCH 002/105] systemd: bump version to v217 - Bump version to v217 - Add a hash file - Adapt the needed patches Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- ...the-__NR_memfd_create-macro-for-MIPS.patch | 44 +++++++------------ package/systemd/systemd.hash | 2 + package/systemd/systemd.mk | 2 +- 3 files changed, 19 insertions(+), 29 deletions(-) create mode 100644 package/systemd/systemd.hash diff --git a/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch b/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch index 6aca13ced..9ce64c92e 100644 --- a/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch +++ b/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch @@ -1,16 +1,16 @@ Properly define the __NR_memfd_create macro for MIPS This is an upstream patch which has been applied to the master branch -and I have adapted it to make it apply to the v216 version. +and I have adapted it to make it apply to the v217 version. Upstream commit: http://cgit.freedesktop.org/systemd/systemd/commit/?id=e6c019026b8cfd27a997e6e6ed1349f8f289b7e2 Signed-off-by: Vicente Olivert Riera -From cdd25569e583ccfff3aef0eda175a2d07c00f859 Mon Sep 17 00:00:00 2001 +From a51496db6edc8168268c86ea55915405f95b0212 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera -Date: Tue, 4 Nov 2014 10:49:58 +0000 +Date: Thu, 13 Nov 2014 17:32:52 +0000 Subject: [PATCH] Properly define the __NR_memfd_create macro for MIPS This macro exists for MIPS since v3.17: @@ -18,43 +18,31 @@ This macro exists for MIPS since v3.17: Signed-off-by: Vicente Olivert Riera --- - src/shared/missing.h | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + src/shared/missing.h | 11 +++++++++-- + 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/shared/missing.h b/src/shared/missing.h -index 3ff1a21..6888163 100644 +index bb4f8f2..66bedcf 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h -@@ -152,6 +152,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) { - # ifndef __NR_fanotify_mark - # define __NR_fanotify_mark 4337 - # endif -+# ifndef __NR_memfd_create +@@ -125,8 +125,15 @@ static inline int pivot_root(const char *new_root, const char *put_old) { + # endif + #elif defined _MIPS_SIM + # ifndef __NR_memfd_create +-# warning "__NR_memfd_create not yet defined for MIPS" +-# define __NR_memfd_create 0xffffffff ++# if _MIPS_SIM == _MIPS_SIM_ABI32 +# define __NR_memfd_create 4354 +# endif - # elif _MIPS_SIM == _MIPS_SIM_NABI32 - # ifndef __NR_fanotify_init - # define __NR_fanotify_init 6300 -@@ -159,6 +162,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) { - # ifndef __NR_fanotify_mark - # define __NR_fanotify_mark 6301 - # endif -+# ifndef __NR_memfd_create ++# if _MIPS_SIM == _MIPS_SIM_NABI32 +# define __NR_memfd_create 6318 +# endif - # elif _MIPS_SIM == _MIPS_SIM_ABI64 - # ifndef __NR_fanotify_init - # define __NR_fanotify_init 5295 -@@ -166,6 +172,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) { - # ifndef __NR_fanotify_mark - # define __NR_fanotify_mark 5296 - # endif -+# ifndef __NR_memfd_create ++# if _MIPS_SIM == _MIPS_SIM_ABI64 +# define __NR_memfd_create 5314 +# endif # endif #else - # ifndef __NR_fanotify_init + # ifndef __NR_memfd_create -- 1.7.1 diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash new file mode 100644 index 000000000..5b7ba7fb1 --- /dev/null +++ b/package/systemd/systemd.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 a031e6fbcdc7077b37338bae8074d9428ee2fa98033beb4923a62871890f7498 systemd-217.tar.xz diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 75a32f48b..536231922 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 216 +SYSTEMD_VERSION = 217 SYSTEMD_SITE = http://www.freedesktop.org/software/systemd SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz SYSTEMD_LICENSE = LGPLv2.1+; GPLv2+ for udev; MIT-like license for few source files listed in README From 38f33dcaeaa804788109d01807f968cc93e431fd Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 13 Nov 2014 16:45:48 +0000 Subject: [PATCH 003/105] tcl: bump version to 8.6.3 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/tcl/tcl.hash | 2 +- package/tcl/tcl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tcl/tcl.hash b/package/tcl/tcl.hash index e1b338934..2d4e99504 100644 --- a/package/tcl/tcl.hash +++ b/package/tcl/tcl.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 86f7ae5f581dd0904d04415637ab3aef5a50986c1b6d04c340e2b1b0258da9c4 tcl8.6.2-src.tar.gz +sha256 6ce0778de0d50daaa9c345d7c1fd1288fb658f674028812e7eeee992e3051005 tcl8.6.3-src.tar.gz diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 244077224..ef0983be3 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -5,7 +5,7 @@ ################################################################################ TCL_VERSION_MAJOR = 8.6 -TCL_VERSION = $(TCL_VERSION_MAJOR).2 +TCL_VERSION = $(TCL_VERSION_MAJOR).3 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION) TCL_LICENSE = tcl license From deb7dcd48707f4e65774b45d7fbaf21b5dc58ec0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 14 Nov 2014 15:15:10 +0100 Subject: [PATCH 004/105] package: add python-werkzeug Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-werkzeug/Config.in | 7 +++++++ package/python-werkzeug/python-werkzeug.hash | 3 +++ package/python-werkzeug/python-werkzeug.mk | 14 ++++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 package/python-werkzeug/Config.in create mode 100644 package/python-werkzeug/python-werkzeug.hash create mode 100644 package/python-werkzeug/python-werkzeug.mk diff --git a/package/Config.in b/package/Config.in index 28cf70323..ace08e0d1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -523,6 +523,7 @@ menu "external python modules" source "package/python-tornado/Config.in" source "package/python-urwid/Config.in" source "package/python-versiontools/Config.in" + source "package/python-werkzeug/Config.in" endmenu endif source "package/ruby/Config.in" diff --git a/package/python-werkzeug/Config.in b/package/python-werkzeug/Config.in new file mode 100644 index 000000000..2097d6e34 --- /dev/null +++ b/package/python-werkzeug/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_WERKZEUG + bool "python-werkzeug" + help + Werkzeug is a WSGI utility library for Python. It's widely + used and BSD licensed. + + http://werkzeug.pocoo.org/ diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash new file mode 100644 index 000000000..38f622aea --- /dev/null +++ b/package/python-werkzeug/python-werkzeug.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f7afcadc03b0f2267bdc156c34586043, sha256 locally computed +md5 f7afcadc03b0f2267bdc156c34586043 Werkzeug-0.9.6.tar.gz +sha256 7f11e7e2e73eb22677cac1b11113eb6106f66cedef13d140e83cf6563c90b79c Werkzeug-0.9.6.tar.gz diff --git a/package/python-werkzeug/python-werkzeug.mk b/package/python-werkzeug/python-werkzeug.mk new file mode 100644 index 000000000..8902d1709 --- /dev/null +++ b/package/python-werkzeug/python-werkzeug.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-werkzeug +# +################################################################################ + +PYTHON_WERKZEUG_VERSION = 0.9.6 +PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz +PYTHON_WERKZEUG_SITE = http://pypi.python.org/packages/source/W/Werkzeug +PYTHON_WERKZEUG_SETUP_TYPE = setuptools +PYTHON_WERKZEUG_LICENSE = BSD-3c +PYTHON_WERKZEUG_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From b534b5aaca63fd0c981ea421999bcd4b562fecda Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 14 Nov 2014 15:59:52 +0100 Subject: [PATCH 005/105] package: add python-jinja2 Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-jinja2/Config.in | 8 ++++++++ package/python-jinja2/python-jinja2.hash | 3 +++ package/python-jinja2/python-jinja2.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-jinja2/Config.in create mode 100644 package/python-jinja2/python-jinja2.hash create mode 100644 package/python-jinja2/python-jinja2.mk diff --git a/package/Config.in b/package/Config.in index ace08e0d1..4e894471d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -493,6 +493,7 @@ menu "external python modules" source "package/python-id3/Config.in" source "package/python-ipy/Config.in" source "package/python-ipython/Config.in" + source "package/python-jinja2/Config.in" source "package/python-json-schema-validator/Config.in" source "package/python-keyring/Config.in" source "package/python-libconfig/Config.in" diff --git a/package/python-jinja2/Config.in b/package/python-jinja2/Config.in new file mode 100644 index 000000000..1d9131aff --- /dev/null +++ b/package/python-jinja2/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_JINJA2 + bool "python-jinja2" + help + Jinja2 is a template engine written in pure Python. It + provides a Django inspired non-XML syntax but supports + inline expressions and an optional sandboxed environment. + + http://jinja.pocoo.org/ diff --git a/package/python-jinja2/python-jinja2.hash b/package/python-jinja2/python-jinja2.hash new file mode 100644 index 000000000..6e8c1603b --- /dev/null +++ b/package/python-jinja2/python-jinja2.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=b9dffd2f3b43d673802fe857c8445b1a, sha256 locally computed +md5 b9dffd2f3b43d673802fe857c8445b1a Jinja2-2.7.3.tar.gz +sha256 2e24ac5d004db5714976a04ac0e80c6df6e47e98c354cb2c0d82f8879d4f8fdb Jinja2-2.7.3.tar.gz diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk new file mode 100644 index 000000000..49625e367 --- /dev/null +++ b/package/python-jinja2/python-jinja2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-jinja2 +# +################################################################################ + +PYTHON_JINJA2_VERSION = 2.7.3 +PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz +PYTHON_JINJA2_SITE = http://pypi.python.org/packages/source/J/Jinja2 +PYTHON_JINJA2_SETUP_TYPE = setuptools +PYTHON_JINJA2_LICENSE = BSD-3c +PYTHON_JINJA2_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 5c3d11909048a42c702594e1354ee1d4603419b4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 14 Nov 2014 18:25:04 +0100 Subject: [PATCH 006/105] package: add python-itsdangerous Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-itsdangerous/Config.in | 7 +++++++ package/python-itsdangerous/python-itsdangerous.mk | 13 +++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 package/python-itsdangerous/Config.in create mode 100644 package/python-itsdangerous/python-itsdangerous.mk diff --git a/package/Config.in b/package/Config.in index 4e894471d..ba97db7a7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -493,6 +493,7 @@ menu "external python modules" source "package/python-id3/Config.in" source "package/python-ipy/Config.in" source "package/python-ipython/Config.in" + source "package/python-itsdangerous/Config.in" source "package/python-jinja2/Config.in" source "package/python-json-schema-validator/Config.in" source "package/python-keyring/Config.in" diff --git a/package/python-itsdangerous/Config.in b/package/python-itsdangerous/Config.in new file mode 100644 index 000000000..6670af541 --- /dev/null +++ b/package/python-itsdangerous/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_ITSDANGEROUS + bool "python-itsdangerous" + help + Itsdangerous contains various helpers to pass data to + untrusted environments and to get it back safe and sound. + + http://pythonhosted.org/itsdangerous/ diff --git a/package/python-itsdangerous/python-itsdangerous.mk b/package/python-itsdangerous/python-itsdangerous.mk new file mode 100644 index 000000000..8b055d6da --- /dev/null +++ b/package/python-itsdangerous/python-itsdangerous.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-itsdangerous +# +################################################################################ + +PYTHON_ITSDANGEROUS_VERSION = 0.24 +PYTHON_ITSDANGEROUS_SITE = $(call github,mitsuhiko,itsdangerous,$(PYTHON_ITSDANGEROUS_VERSION)) +PYTHON_ITSDANGEROUS_SETUP_TYPE = setuptools +PYTHON_ITSDANGEROUS_LICENSE = BSD-3c +PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 541d9452237ba5fc00a42a0a7e4019518d7ec4ce Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 14 Nov 2014 19:00:11 +0100 Subject: [PATCH 007/105] package: add python-flask Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-flask/Config.in | 10 ++++++++++ package/python-flask/python-flask.hash | 3 +++ package/python-flask/python-flask.mk | 15 +++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-flask/Config.in create mode 100644 package/python-flask/python-flask.hash create mode 100644 package/python-flask/python-flask.mk diff --git a/package/Config.in b/package/Config.in index ba97db7a7..3e5ad3966 100644 --- a/package/Config.in +++ b/package/Config.in @@ -489,6 +489,7 @@ menu "external python modules" source "package/python-daemon/Config.in" source "package/python-dialog/Config.in" source "package/python-dpkt/Config.in" + source "package/python-flask/Config.in" source "package/python-flup/Config.in" source "package/python-id3/Config.in" source "package/python-ipy/Config.in" diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in new file mode 100644 index 000000000..4a955c458 --- /dev/null +++ b/package/python-flask/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_FLASK + bool "python-flask" + select BR2_PACKAGE_PYTHON_WERKZEUG + select BR2_PACKAGE_PYTHON_JINJA2 + select BR2_PACKAGE_PYTHON_ITSDANGEROUS + help + Flask is a microframework for Python based on Werkzeug, + Jinja 2 and good intentions. + + http://flask.pocoo.org/ diff --git a/package/python-flask/python-flask.hash b/package/python-flask/python-flask.hash new file mode 100644 index 000000000..55d0a5c58 --- /dev/null +++ b/package/python-flask/python-flask.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=378670fe456957eb3c27ddaef60b2b24, sha256 locally computed +md5 378670fe456957eb3c27ddaef60b2b24 Flask-0.10.1.tar.gz +sha256 4c83829ff83d408b5e1d4995472265411d2c414112298f2eb4b359d9e4563373 Flask-0.10.1.tar.gz diff --git a/package/python-flask/python-flask.mk b/package/python-flask/python-flask.mk new file mode 100644 index 000000000..d7e3d1fe5 --- /dev/null +++ b/package/python-flask/python-flask.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-flask +# +################################################################################ + +PYTHON_FLASK_VERSION = 0.10.1 +PYTHON_FLASK_SOURCE = Flask-$(PYTHON_FLASK_VERSION).tar.gz +PYTHON_FLASK_SITE = http://pypi.python.org/packages/source/F/Flask +PYTHON_FLASK_SETUP_TYPE = setuptools +PYTHON_FLASK_LICENSE = BSD-3c +PYTHON_FLASK_LICENSE_FILES = LICENSE +PYTHON_FLASH_DEPENDENCIES = python-werkzeug python-jinja2 python-itsdangerous + +$(eval $(python-package)) From 82e23f15a11c2cd66d0f6c6397906663c9c9e1d7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 17 Nov 2014 15:18:29 +0100 Subject: [PATCH 008/105] python-werkzeug: needs python zlib support Otherwise import fails: >>> import werkzeug Traceback (most recent call last): File "", line 1, in File "/usr/lib/python2.7/site-packages/werkzeug/__init__.py", line 154, in File "/usr/lib/python2.7/site-packages/werkzeug/exceptions.py", line 71, in File "/usr/lib/python2.7/site-packages/werkzeug/wrappers.py", line 35, in File "/usr/lib/python2.7/site-packages/werkzeug/formparser.py", line 21, in File "/usr/lib/python2.7/site-packages/werkzeug/wsgi.py", line 17, in ImportError: No module named zlib Signed-off-by: Peter Korsgaard --- package/python-werkzeug/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-werkzeug/Config.in b/package/python-werkzeug/Config.in index 2097d6e34..79e9a4561 100644 --- a/package/python-werkzeug/Config.in +++ b/package/python-werkzeug/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_WERKZEUG bool "python-werkzeug" + select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime help Werkzeug is a WSGI utility library for Python. It's widely used and BSD licensed. From 771f8d4f1965ee7801fe0f71a21b49ca40b73c31 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 17 Nov 2014 16:49:38 +0100 Subject: [PATCH 009/105] package: add python-markupsafe Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-markupsafe/Config.in | 7 +++++++ package/python-markupsafe/python-markupsafe.hash | 3 +++ package/python-markupsafe/python-markupsafe.mk | 14 ++++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 package/python-markupsafe/Config.in create mode 100644 package/python-markupsafe/python-markupsafe.hash create mode 100644 package/python-markupsafe/python-markupsafe.mk diff --git a/package/Config.in b/package/Config.in index 3e5ad3966..92af9424f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -500,6 +500,7 @@ menu "external python modules" source "package/python-keyring/Config.in" source "package/python-libconfig/Config.in" source "package/python-mad/Config.in" + source "package/python-markupsafe/Config.in" source "package/python-meld3/Config.in" source "package/python-msgpack/Config.in" source "package/python-netifaces/Config.in" diff --git a/package/python-markupsafe/Config.in b/package/python-markupsafe/Config.in new file mode 100644 index 000000000..48421e0a3 --- /dev/null +++ b/package/python-markupsafe/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_MARKUPSAFE + bool "python-markupsafe" + help + MarkupSafe implements a XML/HTML/XHTML Markup safe string + for Python. + + https://github.com/mitsuhiko/markupsafe diff --git a/package/python-markupsafe/python-markupsafe.hash b/package/python-markupsafe/python-markupsafe.hash new file mode 100644 index 000000000..448252b0d --- /dev/null +++ b/package/python-markupsafe/python-markupsafe.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f5ab3deee4c37cd6a922fb81e730da6e, sha256 locally computed +md5 f5ab3deee4c37cd6a922fb81e730da6e MarkupSafe-0.23.tar.gz +sha256 a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3 MarkupSafe-0.23.tar.gz diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk new file mode 100644 index 000000000..9c7eb14c9 --- /dev/null +++ b/package/python-markupsafe/python-markupsafe.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-markupsafe +# +################################################################################ + +PYTHON_MARKUPSAFE_VERSION = 0.23 +PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz +PYTHON_MARKUPSAFE_SITE = http://pypi.python.org/packages/source/M/MarkupSafe +PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools +PYTHON_MARKUPSAFE_LICENSE = BSD-3c +PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From afae45bb8340926b3043c05fe6395ebdc839b82f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 17 Nov 2014 16:50:56 +0100 Subject: [PATCH 010/105] python-jinja2: needs markupsafe at runtime Otherwise import fails: ImportError: No module named markupsafe Reported-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-jinja2/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-jinja2/Config.in b/package/python-jinja2/Config.in index 1d9131aff..a1900e94d 100644 --- a/package/python-jinja2/Config.in +++ b/package/python-jinja2/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_JINJA2 bool "python-jinja2" + select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime help Jinja2 is a template engine written in pure Python. It provides a Django inspired non-XML syntax but supports From a6f0cfa51fc5b0480779885a00d67c1a36e77947 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 12 Nov 2014 01:27:04 +0100 Subject: [PATCH 011/105] python-webpy: add new package [Peter: drop redundant python|python3 dependency] Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-webpy/Config.in | 7 +++++++ package/python-webpy/python-webpy.mk | 13 +++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 package/python-webpy/Config.in create mode 100644 package/python-webpy/python-webpy.mk diff --git a/package/Config.in b/package/Config.in index 92af9424f..1d132af46 100644 --- a/package/Config.in +++ b/package/Config.in @@ -527,6 +527,7 @@ menu "external python modules" source "package/python-tornado/Config.in" source "package/python-urwid/Config.in" source "package/python-versiontools/Config.in" + source "package/python-webpy/Config.in" source "package/python-werkzeug/Config.in" endmenu endif diff --git a/package/python-webpy/Config.in b/package/python-webpy/Config.in new file mode 100644 index 000000000..1e90892d2 --- /dev/null +++ b/package/python-webpy/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_WEBPY + bool "python-webpy" + help + web.py is a web framework for Python that is as simple as it is + powerful. + + http://webpy.org/ diff --git a/package/python-webpy/python-webpy.mk b/package/python-webpy/python-webpy.mk new file mode 100644 index 000000000..ef5b6b3d7 --- /dev/null +++ b/package/python-webpy/python-webpy.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-webpy +# +################################################################################ + +PYTHON_WEBPY_VERSION = 0.37 +PYTHON_WEBPY_SITE = $(call github,webpy,webpy,webpy-$(PYTHON_WEBPY_VERSION)) +PYTHON_WEBPY_SETUP_TYPE = distutils +PYTHON_WEBPY_LICENSE = Public Domain, CherryPy License +PYTHON_WEBPY_LICENSE_FILES = LICENSE.txt web/wsgiserver/LICENSE.txt + +$(eval $(python-package)) From b2b538bda710f750c1e534e516964dc5795af14e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 17 Nov 2014 17:54:28 +0100 Subject: [PATCH 012/105] package: add python-requests Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-requests/Config.in | 7 +++++++ package/python-requests/python-requests.hash | 3 +++ package/python-requests/python-requests.mk | 14 ++++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 package/python-requests/Config.in create mode 100644 package/python-requests/python-requests.hash create mode 100644 package/python-requests/python-requests.mk diff --git a/package/Config.in b/package/Config.in index 1d132af46..d59876f2b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -519,6 +519,7 @@ menu "external python modules" source "package/python-pysnmp-mibs/Config.in" source "package/python-pyusb/Config.in" source "package/python-pyzmq/Config.in" + source "package/python-requests/Config.in" source "package/python-rtslib-fb/Config.in" source "package/python-serial/Config.in" source "package/python-setuptools/Config.in" diff --git a/package/python-requests/Config.in b/package/python-requests/Config.in new file mode 100644 index 000000000..3367cf070 --- /dev/null +++ b/package/python-requests/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_REQUESTS + bool "python-requests" + help + Requests is an Apache2 Licensed HTTP library, written in + Python, for human beings. + + http://www.python-requests.org/ diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash new file mode 100644 index 000000000..d187dcd2a --- /dev/null +++ b/package/python-requests/python-requests.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=02214b3a179e445545de4b7a98d3dd17, sha256 locally computed +md5 02214b3a179e445545de4b7a98d3dd17 requests-2.4.3.tar.gz +sha256 53c68313c5c6149b1a899234c000296e60a8900682accf73d6f0c6d608afc6b1 requests-2.4.3.tar.gz diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk new file mode 100644 index 000000000..5c12f1b56 --- /dev/null +++ b/package/python-requests/python-requests.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-requests +# +################################################################################ + +PYTHON_REQUESTS_VERSION = 2.4.3 +PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz +PYTHON_REQUESTS_SITE = http://pypi.python.org/packages/source/r/requests +PYTHON_REQUESTS_SETUP_TYPE = setuptools +PYTHON_REQUESTS_LICENSE = Apache-2.0 +PYTHON_REQUESTS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 026954ca44593f717c97fe832b39d2bd867496ec Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 17 Nov 2014 21:33:50 +0100 Subject: [PATCH 013/105] python-itsdangerous: needs python zlib support Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-itsdangerous/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-itsdangerous/Config.in b/package/python-itsdangerous/Config.in index 6670af541..39ec0b772 100644 --- a/package/python-itsdangerous/Config.in +++ b/package/python-itsdangerous/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_ITSDANGEROUS bool "python-itsdangerous" + select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime help Itsdangerous contains various helpers to pass data to untrusted environments and to get it back safe and sound. From bcb083c2eaffbf5b28f32567b2ebf8308a2f52a0 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 18 Nov 2014 10:16:20 +0000 Subject: [PATCH 014/105] imagemagick: bump version to 6.9.0-0 - Bump version to 6.9.0-0 - Update the hash value Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/imagemagick/imagemagick.hash | 4 ++-- package/imagemagick/imagemagick.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index e67e059e8..20bc9822c 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,2 +1,2 @@ -# Locally calculated after checking pgp signature -sha256 a4cccc70179ff2c67550e063cdcb2e62907338ef3e68b45bb1c41931e515b3eb ImageMagick-6.8.9-9.tar.xz +# From ftp://ftp.nluug.nl/pub/ImageMagick/digest.rdf +sha256 12331c904c691cb128865fdc97e5f8a2654576f9b032e274b74dd7617aa1b9b6 ImageMagick-6.9.0-0.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index a1296d44f..b8e515501 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 6.8.9-9 +IMAGEMAGICK_VERSION = 6.9.0-0 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz # The official ImageMagick site only keeps the latest versions # available, which is annoying. Use an alternate site that keeps all From 0d9084ce9d38b5f6fb788a06b02e0be0278663d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 18 Nov 2014 01:00:20 +0100 Subject: [PATCH 015/105] package/shairport-sync: bump to version 2.1.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/shairport-sync/shairport-sync.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index da6917185..9ae6d9738 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAIRPORT_SYNC_VERSION = 2.1.8 +SHAIRPORT_SYNC_VERSION = 2.1.11 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) SHAIRPORT_SYNC_LICENSE = MIT, BSD-3c From 047fea1d4fa33c4c934272a05649907a59186015 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 17 Nov 2014 16:59:36 +0000 Subject: [PATCH 016/105] kmod: bump to version 19 - Bump to version 19 - Rename 0001 patch to follow the new name convention - Adapt the 0001 patch to the new version - Remove the already-upstreamed 0002 patch - Update the hash value [Thomas: adapt comment in the updated 0001 patch.] Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- ...CLOEXEC.patch => 0001-fix-O_CLOEXEC.patch} | 11 +-- ...add-backup-implementation-of-be32toh.patch | 72 ------------------- package/kmod/kmod.hash | 2 +- package/kmod/kmod.mk | 2 +- 4 files changed, 9 insertions(+), 78 deletions(-) rename package/kmod/{kmod-0001-fix-O_CLOEXEC.patch => 0001-fix-O_CLOEXEC.patch} (83%) delete mode 100644 package/kmod/kmod-0002-add-backup-implementation-of-be32toh.patch diff --git a/package/kmod/kmod-0001-fix-O_CLOEXEC.patch b/package/kmod/0001-fix-O_CLOEXEC.patch similarity index 83% rename from package/kmod/kmod-0001-fix-O_CLOEXEC.patch rename to package/kmod/0001-fix-O_CLOEXEC.patch index 4861c5746..145ac3420 100644 --- a/package/kmod/kmod-0001-fix-O_CLOEXEC.patch +++ b/package/kmod/0001-fix-O_CLOEXEC.patch @@ -15,20 +15,23 @@ This problem was reported by "Ting Liu " - move dummy definition from libkmod-internal.h to missing.h - update commit title] +[Vicente: Adapt this patch to version 19.] + Signed-off-by: Thomas De Schampheleire +Signed-off-by: Vicente Olivert Riera Upstream-status: rejected, suggests to add in buildroot instead [1] [1] http://news.gmane.org/find-root.php?message_id=1412062906%2d27378%2d1%2dgit%2dsend%2demail%2dpatrickdepinguin%40gmail.com --- - libkmod/missing.h | 4 ++++ + shared/missing.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) -diff --git a/libkmod/missing.h b/libkmod/missing.h +diff --git a/shared/missing.h b/shared/missing.h index 4c0d136..e123e98 100644 ---- a/libkmod/missing.h -+++ b/libkmod/missing.h +--- a/shared/missing.h ++++ b/shared/missing.h @@ -19,6 +19,10 @@ # define __NR_finit_module -1 #endif diff --git a/package/kmod/kmod-0002-add-backup-implementation-of-be32toh.patch b/package/kmod/kmod-0002-add-backup-implementation-of-be32toh.patch deleted file mode 100644 index 869c56950..000000000 --- a/package/kmod/kmod-0002-add-backup-implementation-of-be32toh.patch +++ /dev/null @@ -1,72 +0,0 @@ -From bda1ed2aefee23b0eedbcd9f82e73c2547908438 Mon Sep 17 00:00:00 2001 -From: Randy MacLeod -Date: Mon, 29 Sep 2014 12:32:20 +0200 -Subject: [PATCH] Add back-up implementation of be32toh() - -Older systems may not have the be32toh function defined. Check for this -and fall back to checking the endianness and calling bswap_32 directly -if needed. This works on both old and new systems. - -[Thomas De Schampheleire : -address comments raised by Lucas De Marchi [1], update commit message] - -Signed-off-by: Thomas De Schampheleire - -Upstream-status: accepted [2] - -[1] http://www.spinics.net/lists/linux-modules/msg01129.html -[2] https://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=9b34db1ae63427269f918b2868b4cfcb50e6259b - ---- - configure.ac | 3 +++ - libkmod/libkmod-signature.c | 1 + - libkmod/missing.h | 10 ++++++++++ - 3 files changed, 14 insertions(+), 0 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7781ce1..cd676bc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -53,6 +53,9 @@ AC_CHECK_MEMBERS([struct stat.st_mtim], [], [], [#include ]) - # musl 1.0 and bionic 4.4 don't have strndupa - AC_CHECK_DECLS_ONCE([strndupa]) - -+# RHEL 5 and older do not have be32toh -+AC_CHECK_DECLS_ONCE([be32toh]) -+ - # Check kernel headers - AC_CHECK_HEADERS_ONCE([linux/module.h]) - -diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c -index a3ac15e..28f993e 100644 ---- a/libkmod/libkmod-signature.c -+++ b/libkmod/libkmod-signature.c -@@ -25,6 +25,7 @@ - #include - - #include "libkmod-internal.h" -+#include "missing.h" - - /* These types and tables were copied from the 3.7 kernel sources. - * As this is just description of the signature format, it should not be -diff --git a/libkmod/missing.h b/libkmod/missing.h -index 8d47af8..4c0d136 100644 ---- a/libkmod/missing.h -+++ b/libkmod/missing.h -@@ -43,3 +43,13 @@ static inline int finit_module(int fd, const char *uargs, int flags) - memcpy(__new, __old, __len); \ - }) - #endif -+ -+#if !HAVE_DECL_BE32TOH -+#include -+#include -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+#define be32toh(x) bswap_32 (x) -+#else -+#define be32toh(x) (x) -+#endif -+#endif --- -1.7.1 - diff --git a/package/kmod/kmod.hash b/package/kmod/kmod.hash index 8244fd9ed..28f1ca10f 100644 --- a/package/kmod/kmod.hash +++ b/package/kmod/kmod.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc -sha256 e16e57272b54acb219c465b334715cfdddb5d97ff5d8948d4830ca1a372a868e kmod-18.tar.xz +sha256 3e7fee6eeff5435848b2dcc852bc8959066478d687d232284d67300c071e7b14 kmod-19.tar.xz diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index 99ab3877d..cc185c883 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -4,7 +4,7 @@ # ################################################################################ -KMOD_VERSION = 18 +KMOD_VERSION = 19 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod KMOD_INSTALL_STAGING = YES From 30a208b9ef21a7b830b04e68828653407a7af1bd Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 17 Nov 2014 23:23:53 -0500 Subject: [PATCH 017/105] rapidjson: bump to latest GitHub master RapidJSON is now hosted on GitHub and its latest version includes many fixes and features added since 2012. Signed-off-by: Philippe Proulx Signed-off-by: Thomas Petazzoni --- package/rapidjson/rapidjson.mk | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/package/rapidjson/rapidjson.mk b/package/rapidjson/rapidjson.mk index 68e010ede..ff516c412 100644 --- a/package/rapidjson/rapidjson.mk +++ b/package/rapidjson/rapidjson.mk @@ -4,27 +4,26 @@ # ################################################################################ -RAPIDJSON_VERSION = 0.11 -RAPIDJSON_SOURCE = rapidjson-$(RAPIDJSON_VERSION).zip -RAPIDJSON_SITE = http://rapidjson.googlecode.com/files +RAPIDJSON_VERSION = 39f5eeb764c6d1e1cbff1717410d9710bf943009 +RAPIDJSON_SITE = $(call github,miloyip,rapidjson,$(RAPIDJSON_VERSION)) RAPIDJSON_LICENSE = MIT RAPIDJSON_LICENSE_FILES = license.txt RAPIDJSON_INSTALL_TARGET = NO RAPIDJSON_INSTALL_STAGING = YES -define RAPIDJSON_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(RAPIDJSON_SOURCE) - mv $(@D)/rapidjson/* $(@D) - $(RM) -r $(@D)/rapidjson -endef - define RAPIDJSON_INSTALL_STAGING_CMDS $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/internal + $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/error + $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/msinttypes $(INSTALL) -m 0644 $(@D)/include/rapidjson/*.h \ $(STAGING_DIR)/usr/include/rapidjson $(INSTALL) -m 0644 $(@D)/include/rapidjson/internal/*.h \ $(STAGING_DIR)/usr/include/rapidjson/internal + $(INSTALL) -m 0644 $(@D)/include/rapidjson/error/*.h \ + $(STAGING_DIR)/usr/include/rapidjson/error + $(INSTALL) -m 0644 $(@D)/include/rapidjson/msinttypes/*.h \ + $(STAGING_DIR)/usr/include/rapidjson/msinttypes endef $(eval $(generic-package)) From eca98a10b855692d8ef041c0b95d10b1ad793e05 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Nov 2014 13:26:25 +0100 Subject: [PATCH 018/105] package/tvheadend: Bump version Needed to add support for host-python3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tvheadend/tvheadend.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 0fd6eea89..0b564f676 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = c053acd84e5cc48a3e70047f228728bf039cfacd +TVHEADEND_VERSION = fcd16fa0d835d7fd4f57c350ed8b76350440c68c TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPLv3+ TVHEADEND_LICENSE_FILES = LICENSE.md From b0abee37c85b288796dcf7537b6d227833b08f36 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Nov 2014 13:26:26 +0100 Subject: [PATCH 019/105] package/tvheadend: add support for host-python3 Added upstream: https://github.com/tvheadend/tvheadend/commit/5a07ff166a84c65f08d326c69c818f6eef315e68 Tested with these defconfigs: BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_TVHEADEND=y BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PACKAGE_PYTHON=y BR2_PACKAGE_TVHEADEND=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tvheadend/tvheadend.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 0b564f676..b0038c836 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -8,7 +8,7 @@ TVHEADEND_VERSION = fcd16fa0d835d7fd4f57c350ed8b76350440c68c TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPLv3+ TVHEADEND_LICENSE_FILES = LICENSE.md -TVHEADEND_DEPENDENCIES = host-pkgconf host-python openssl +TVHEADEND_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) openssl ifeq ($(BR2_PACKAGE_AVAHI),y) TVHEADEND_DEPENDENCIES += avahi @@ -42,7 +42,7 @@ define TVHEADEND_CONFIGURE_CMDS --prefix=/usr \ --arch="$(ARCH)" \ --cpu="$(BR2_GCC_TARGET_CPU)" \ - --python="$(HOST_DIR)/usr/bin/python2" \ + --python="$(HOST_DIR)/usr/bin/python" \ --disable-dvbscan \ --enable-bundle \ --disable-libffmpeg_static \ From a2dbd039d8ecafd9604b3e55dc09bd7529217b3c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 18 Nov 2014 14:05:17 -0300 Subject: [PATCH 020/105] sg3_utils: bump to version 1.40 Also add hash file. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/sg3_utils/sg3_utils.hash | 2 ++ package/sg3_utils/sg3_utils.mk | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 package/sg3_utils/sg3_utils.hash diff --git a/package/sg3_utils/sg3_utils.hash b/package/sg3_utils/sg3_utils.hash new file mode 100644 index 000000000..d3ae1a00e --- /dev/null +++ b/package/sg3_utils/sg3_utils.hash @@ -0,0 +1,2 @@ +# Locally calculated from download (no sig, hash) +sha256 901ece577d797a8a3870881fe765f6eac4bb381b99a1f7311551689e9f17130b sg3_utils-1.40.tar.xz diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk index d59d26c10..dca0f6bf8 100644 --- a/package/sg3_utils/sg3_utils.mk +++ b/package/sg3_utils/sg3_utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -SG3_UTILS_VERSION = 1.39 +SG3_UTILS_VERSION = 1.40 SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz SG3_UTILS_SITE = http://sg.danny.cz/sg/p SG3_UTILS_LICENSE = BSD-3c @@ -27,10 +27,10 @@ define SG3_UTILS_REMOVE_PROGS raw rbuf rdac read readcap read_block_limits \ read_buffer read_long reassign referrals \ rep_zones requests reset reset_wp rmsn rtpg safte sanitize \ - sat_identify sat_phy_event sat_set_features scan \ - senddiag ses start stpg sync test_rwbuf turs \ - unmap verify vpd write_buffer write_long \ - write_same wr_mode xcopy; do \ + sat_identify sat_phy_event sat_read_gplog sat_set_features \ + scan senddiag ses ses_microcode start stpg sync test_rwbuf \ + turs unmap verify vpd write_buffer write_long \ + write_same write_verify wr_mode xcopy; do \ $(RM) $(TARGET_DIR)/usr/bin/sg_$${prog} ; \ done for prog in \ From ec52d2b7999b844f2e877dfcf43c43e25d63f895 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 18 Nov 2014 14:05:18 -0300 Subject: [PATCH 021/105] whois: bump to version 5.2.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/whois/whois.hash | 4 ++-- package/whois/whois.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/whois/whois.hash b/package/whois/whois.hash index 13efa148a..858eb9452 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,2 +1,2 @@ -# From http://ftp.debian.org/debian/pool/main/w/whois/whois_5.2.1.dsc -sha256 54e6b64f16e10bfaf14ac40025b4272090298f0d9d3e62cbadabf946051515e6 whois_5.2.1.tar.xz +# From http://ftp.debian.org/debian/pool/main/w/whois/whois_5.2.2.dsc +sha256 cba874b457a6b7c4659245780d3d7321d129ab47da86103e07578ec7430fec09 whois_5.2.2.tar.xz diff --git a/package/whois/whois.mk b/package/whois/whois.mk index 13c023003..63268c6ea 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.2.1 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/w/whois +WHOIS_VERSION = 5.2.2 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20141112T101048Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz # take precedence over busybox implementation WHOIS_DEPENDENCIES = host-gettext $(if $(BR2_PACKAGE_BUSYBOX),busybox) From 44d15563c706dce48f84b55bd299fc94c655f071 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 17 Nov 2014 10:18:14 +0200 Subject: [PATCH 022/105] live555: use upstream install target for staging installation Move include directories out of $(STAGING_DIR)/usr/include/live. This is upstream choice, and is consistent with e.g. Debian. Update mplayer and vlc to match. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/live555/live555.mk | 21 ++------------------- package/mplayer/mplayer.mk | 2 +- package/vlc/vlc.mk | 9 ++++----- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/package/live555/live555.mk b/package/live555/live555.mk index e933faaea..8c31a0865 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -23,6 +23,7 @@ define LIVE555_CONFIGURE_CMDS echo 'CPLUSPLUS_COMPILER = $(TARGET_CXX)' >> $(@D)/config.linux echo 'LINK = $(TARGET_CXX) -o' >> $(@D)/config.linux echo 'LINK_OPTS = -L. $(TARGET_LDFLAGS)' >> $(@D)/config.linux + echo 'PREFIX = /usr' >> $(@D)/config.linux (cd $(@D); ./genMakefiles linux) endef @@ -30,31 +31,13 @@ define LIVE555_BUILD_CMDS $(MAKE) -C $(@D) all endef -LIVE555_HEADERS_TO_INSTALL = \ - liveMedia/include \ - groupsock/include \ - UsageEnvironment/include \ - BasicUsageEnvironment/include - -LIVE555_LIBS_TO_INSTALL = \ - liveMedia/libliveMedia.a \ - groupsock/libgroupsock.a \ - UsageEnvironment/libUsageEnvironment.a \ - BasicUsageEnvironment/libBasicUsageEnvironment.a - LIVE555_FILES_TO_INSTALL-y = LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_OPENRTSP) += testProgs/openRTSP LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MEDIASERVER) += mediaServer/live555MediaServer LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MPEG2_INDEXER) += testProgs/MPEG2TransportStreamIndexer define LIVE555_INSTALL_STAGING_CMDS - for i in $(LIVE555_HEADERS_TO_INSTALL); do \ - mkdir -p $(STAGING_DIR)/usr/include/live/`dirname $$i`; \ - cp -a $(@D)/$$i/* $(STAGING_DIR)/usr/include/live/`dirname $$i`; \ - done; \ - for i in $(LIVE555_LIBS_TO_INSTALL); do \ - $(INSTALL) -D -m 0755 $(@D)/$$i $(STAGING_DIR)/usr/lib/`basename $$i`; \ - done + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install endef define LIVE555_INSTALL_TARGET_CMDS diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk index dbde97767..b2530e4a1 100644 --- a/package/mplayer/mplayer.mk +++ b/package/mplayer/mplayer.mk @@ -92,7 +92,7 @@ MPLAYER_DEPENDENCIES += live555 MPLAYER_CONF_OPTS += --enable-live MPLAYER_LIVE555 = liveMedia groupsock UsageEnvironment BasicUsageEnvironment MPLAYER_CFLAGS += \ - $(addprefix -I$(STAGING_DIR)/usr/include/live/,$(MPLAYER_LIVE555)) + $(addprefix -I$(STAGING_DIR)/usr/include/,$(MPLAYER_LIVE555)) MPLAYER_LDFLAGS += $(addprefix -l,$(MPLAYER_LIVE555)) -lstdc++ else MPLAYER_CONF_OPTS += --disable-live diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 7e81d590e..e2c81d6e8 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -231,11 +231,10 @@ VLC_CONF_OPTS += --enable-live555 VLC_DEPENDENCIES += live555 VLC_CONF_ENV += \ LIVE555_CFLAGS="\ - -I$(STAGING_DIR)/usr/include/live \ - -I$(STAGING_DIR)/usr/include/live/BasicUsageEnvironment \ - -I$(STAGING_DIR)/usr/include/live/groupsock \ - -I$(STAGING_DIR)/usr/include/live/liveMedia \ - -I$(STAGING_DIR)/usr/include/live/UsageEnvironment \ + -I$(STAGING_DIR)/usr/include/BasicUsageEnvironment \ + -I$(STAGING_DIR)/usr/include/groupsock \ + -I$(STAGING_DIR)/usr/include/liveMedia \ + -I$(STAGING_DIR)/usr/include/UsageEnvironment \ " \ LIVE555_LIBS="-L$(STAGING_DIR)/usr/lib -lliveMedia" else From eb50abe7cf2e7082907e5949aec8f884b5b45eb8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 18 Nov 2014 14:01:50 -0300 Subject: [PATCH 023/105] debianutils: new package [Thomas: add optional dependency on Busybox, because debianutils installs its own version of which, so we need to override the Busybox one.] Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/debianutils/Config.in | 7 +++++++ package/debianutils/debianutils.hash | 2 ++ package/debianutils/debianutils.mk | 16 ++++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/debianutils/Config.in create mode 100644 package/debianutils/debianutils.hash create mode 100644 package/debianutils/debianutils.mk diff --git a/package/Config.in b/package/Config.in index d59876f2b..a6977ce8c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1204,6 +1204,7 @@ endif source "package/cpuload/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/dcron/Config.in" + source "package/debianutils/Config.in" endif source "package/dsp-tools/Config.in" source "package/ftop/Config.in" diff --git a/package/debianutils/Config.in b/package/debianutils/Config.in new file mode 100644 index 000000000..f86586870 --- /dev/null +++ b/package/debianutils/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_DEBIANUTILS + bool "debianutils" + depends on BR2_USE_MMU # fork() + help + Miscellaneous utilities specific to Debian. + + https://tracker.debian.org/pkg/debianutils diff --git a/package/debianutils/debianutils.hash b/package/debianutils/debianutils.hash new file mode 100644 index 000000000..089dd425f --- /dev/null +++ b/package/debianutils/debianutils.hash @@ -0,0 +1,2 @@ +# From http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_4.4.dsc +sha256 190850cdd6b5302e0a1ba1aaed1bc7074d67d3bd8d04c613f242f7145afa53a6 debianutils_4.4.tar.gz diff --git a/package/debianutils/debianutils.mk b/package/debianutils/debianutils.mk new file mode 100644 index 000000000..dd7877423 --- /dev/null +++ b/package/debianutils/debianutils.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# debianutils +# +################################################################################ + +DEBIANUTILS_VERSION = 4.4 +DEBIANUTILS_SOURCE = debianutils_$(DEBIANUTILS_VERSION).tar.gz +DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20130728T034252Z/pool/main/d/debianutils +DEBIANUTILS_CONF_OPTS = --exec-prefix=/ +# Make sure we override the busybox tools, such as which +DEBIANUTILS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) +DEBIANUTILS_LICENSE = GPLv2+, SMAIL (savelog) +DEBIANUTILS_LICENSE_FILES = debian/copyright + +$(eval $(autotools-package)) From cc3f5258d214d435bbe4a4f5a76caba5977421be Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 18 Nov 2014 09:29:39 -0500 Subject: [PATCH 024/105] rapidjson: simplify install commands Signed-off-by: Philippe Proulx Acked-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/rapidjson/rapidjson.mk | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/package/rapidjson/rapidjson.mk b/package/rapidjson/rapidjson.mk index ff516c412..6658da25f 100644 --- a/package/rapidjson/rapidjson.mk +++ b/package/rapidjson/rapidjson.mk @@ -12,18 +12,7 @@ RAPIDJSON_INSTALL_TARGET = NO RAPIDJSON_INSTALL_STAGING = YES define RAPIDJSON_INSTALL_STAGING_CMDS - $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson - $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/internal - $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/error - $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/msinttypes - $(INSTALL) -m 0644 $(@D)/include/rapidjson/*.h \ - $(STAGING_DIR)/usr/include/rapidjson - $(INSTALL) -m 0644 $(@D)/include/rapidjson/internal/*.h \ - $(STAGING_DIR)/usr/include/rapidjson/internal - $(INSTALL) -m 0644 $(@D)/include/rapidjson/error/*.h \ - $(STAGING_DIR)/usr/include/rapidjson/error - $(INSTALL) -m 0644 $(@D)/include/rapidjson/msinttypes/*.h \ - $(STAGING_DIR)/usr/include/rapidjson/msinttypes + cp -dpfr $(@D)/include/* $(STAGING_DIR)/usr/include endef $(eval $(generic-package)) From 924d832cb46033a0cedb7ec32153ff705ad9f799 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Nov 2014 15:00:46 +0100 Subject: [PATCH 025/105] package/openssl: rename patches to the new convention Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...sl-001-do-not-build-docs.patch => 001-do-not-build-docs.patch} | 0 ...ont-force-large-file.patch => 002-dont-force-large-file.patch} | 0 ...ch => 003-cryptodev-Fix-issue-with-signature-generation.patch} | 0 .../{openssl-004-musl-termios.patch => 004-musl-termios.patch} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename package/openssl/{openssl-001-do-not-build-docs.patch => 001-do-not-build-docs.patch} (100%) rename package/openssl/{openssl-002-dont-force-large-file.patch => 002-dont-force-large-file.patch} (100%) rename package/openssl/{openssl-003-cryptodev-Fix-issue-with-signature-generation.patch => 003-cryptodev-Fix-issue-with-signature-generation.patch} (100%) rename package/openssl/{openssl-004-musl-termios.patch => 004-musl-termios.patch} (100%) diff --git a/package/openssl/openssl-001-do-not-build-docs.patch b/package/openssl/001-do-not-build-docs.patch similarity index 100% rename from package/openssl/openssl-001-do-not-build-docs.patch rename to package/openssl/001-do-not-build-docs.patch diff --git a/package/openssl/openssl-002-dont-force-large-file.patch b/package/openssl/002-dont-force-large-file.patch similarity index 100% rename from package/openssl/openssl-002-dont-force-large-file.patch rename to package/openssl/002-dont-force-large-file.patch diff --git a/package/openssl/openssl-003-cryptodev-Fix-issue-with-signature-generation.patch b/package/openssl/003-cryptodev-Fix-issue-with-signature-generation.patch similarity index 100% rename from package/openssl/openssl-003-cryptodev-Fix-issue-with-signature-generation.patch rename to package/openssl/003-cryptodev-Fix-issue-with-signature-generation.patch diff --git a/package/openssl/openssl-004-musl-termios.patch b/package/openssl/004-musl-termios.patch similarity index 100% rename from package/openssl/openssl-004-musl-termios.patch rename to package/openssl/004-musl-termios.patch From 38372fbbef3087d0ebf3ccd8ebd332c2565f95c2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 18 Nov 2014 14:01:53 -0300 Subject: [PATCH 026/105] dhcp: install dhclient to /sbin Debian ifupdown uses an explicit call to /sbin/dhclient. Busybox ifupdown uses the search path. Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/dhcp/dhcp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 27fb60b74..1eb6b3254 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -59,7 +59,7 @@ define DHCP_INSTALL_CLIENT mkdir -p $(TARGET_DIR)/var/lib (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) $(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient \ - $(TARGET_DIR)/usr/sbin/dhclient + $(TARGET_DIR)/sbin/dhclient $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \ $(TARGET_DIR)/etc/dhcp/dhclient.conf $(INSTALL) -m 0755 -D package/dhcp/dhclient-script \ From 36c84781293bda65d0374962463c1663735b8907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20Mart=C3=ADnez?= Date: Mon, 17 Nov 2014 14:19:10 -0300 Subject: [PATCH 027/105] package: linux-fusion: use install instead of cp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in order to not depend on the previous permissions of the file Signed-off-by: Guido Martínez Reviewed-by: "Yann E. MORIN" Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/linux-fusion/linux-fusion.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk index c5e797674..001388c67 100644 --- a/package/linux-fusion/linux-fusion.mk +++ b/package/linux-fusion/linux-fusion.mk @@ -36,8 +36,8 @@ define LINUX_FUSION_INSTALL_TARGET_CMDS $(LINUX_FUSION_MAKE_OPTS) \ INSTALL_MOD_PATH=$(TARGET_DIR) \ -C $(@D) install - mkdir -p $(LINUX_FUSION_ETC_DIR) - cp -dpf package/linux-fusion/40-fusion.rules $(LINUX_FUSION_ETC_DIR) + $(INSTALL) -D -m 644 package/linux-fusion/40-fusion.rules \ + $(LINUX_FUSION_ETC_DIR)/40-fusion.rules endef $(eval $(generic-package)) From 6d6728ac2c42abbf3a9233fb8f473959f4d5be74 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 17 Nov 2014 10:18:15 +0200 Subject: [PATCH 028/105] live555: add support for building dynamic libraries Both config.linux and config.linux-with-shared-libraries already exist in upstream code. We are only appending to these files to override some variables. The linux-with-shared-libraries variant defines a few additional variables needed for dynamic linking (library version, installation target). Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/live555/live555.mk | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/package/live555/live555.mk b/package/live555/live555.mk index 8c31a0865..b923388de 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -13,18 +13,30 @@ LIVE555_INSTALL_STAGING = YES LIVE555_CFLAGS = $(TARGET_CFLAGS) +ifeq ($(BR2_PREFER_STATIC_LIB),y) +LIVE555_CONFIG_TARGET = linux +LIVE555_LIBRARY_LINK = $(TARGET_AR) cr +else +LIVE555_CONFIG_TARGET = linux-with-shared-libraries +LIVE555_LIBRARY_LINK = $(TARGET_CC) -o +endif + ifndef ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif define LIVE555_CONFIGURE_CMDS - echo 'COMPILE_OPTS = $$(INCLUDES) -I. -DSOCKLEN_T=socklen_t $(LIVE555_CFLAGS)' >> $(@D)/config.linux - echo 'C_COMPILER = $(TARGET_CC)' >> $(@D)/config.linux - echo 'CPLUSPLUS_COMPILER = $(TARGET_CXX)' >> $(@D)/config.linux - echo 'LINK = $(TARGET_CXX) -o' >> $(@D)/config.linux - echo 'LINK_OPTS = -L. $(TARGET_LDFLAGS)' >> $(@D)/config.linux - echo 'PREFIX = /usr' >> $(@D)/config.linux - (cd $(@D); ./genMakefiles linux) + echo 'COMPILE_OPTS = $$(INCLUDES) -I. -DSOCKLEN_T=socklen_t $(LIVE555_CFLAGS)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + echo 'C_COMPILER = $(TARGET_CC)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + echo 'CPLUSPLUS_COMPILER = $(TARGET_CXX)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + + echo 'LINK = $(TARGET_CXX) -o' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + echo 'LINK_OPTS = -L. $(TARGET_LDFLAGS)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + echo 'PREFIX = /usr' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + # Must have a whitespace at the end of LIBRARY_LINK, otherwise static link + # fails + echo 'LIBRARY_LINK = $(LIVE555_LIBRARY_LINK) ' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + (cd $(@D); ./genMakefiles $(LIVE555_CONFIG_TARGET)) endef define LIVE555_BUILD_CMDS From 7ee766369ca05964e00a1a1341ec6b5716b7fda5 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 17 Nov 2014 10:18:16 +0200 Subject: [PATCH 029/105] vlc: allow dynamically linking live555 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/vlc/vlc.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index e2c81d6e8..19f1058df 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -224,9 +224,7 @@ else VLC_CONF_OPTS += --disable-libxml2 endif -# live555 installs a static library only, and vlc tries to link it into a -# shared library - which doesn't work. So only enable live555 if static. -ifeq ($(BR2_PACKAGE_LIVE555)$(BR2_PREFER_STATIC_LIB),yy) +ifeq ($(BR2_PACKAGE_LIVE555),y) VLC_CONF_OPTS += --enable-live555 VLC_DEPENDENCIES += live555 VLC_CONF_ENV += \ From d30cc67c51efe44bc2b5b7ce750dca25c06b2cb9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 19 Nov 2014 08:44:34 -0300 Subject: [PATCH 030/105] mpd: bump to version 0.19.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 3e9117973..f8bf014d4 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 fee3f3c59b5806767f23f7962621be7a62d4fcb852fff6b9ed6bbb5598a556d3 mpd-0.19.3.tar.xz +sha256 18f4af89e8b9a434da2b8678b53fc8189da97c1f32e9083512d67217166d3bd8 mpd-0.19.4.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 7061bdbe8..1369847f6 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.19 -MPD_VERSION = $(MPD_VERSION_MAJOR).3 +MPD_VERSION = $(MPD_VERSION_MAJOR).4 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost libglib2 From 59fae9353b475d985b5412b08b233f3d0a53ea03 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 14 Nov 2014 19:31:12 +0100 Subject: [PATCH 031/105] libevdev: bump version to 1.3.1 See [1] and [2] for details. [1] http://lists.freedesktop.org/archives/input-tools/2014-September/001112.html [2] http://lists.freedesktop.org/archives/input-tools/2014-November/001123.html Signed-off-by: Peter Seiderer Reviewed-by: Vicente Olivert Riera Tested-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/libevdev/libevdev.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libevdev/libevdev.mk b/package/libevdev/libevdev.mk index fde7d3ce9..2fc8ff723 100644 --- a/package/libevdev/libevdev.mk +++ b/package/libevdev/libevdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.2.2 +LIBEVDEV_VERSION = 1.3.1 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev/ LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz LIBEVDEV_LICENSE = X11 From 3b14aa2e7d8586e9adf8ce2d81c7392cf2378fb5 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 14 Nov 2014 19:31:13 +0100 Subject: [PATCH 032/105] libevdev: add hash Signed-off-by: Peter Seiderer Reviewed-by: Vicente Olivert Riera Tested-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/libevdev/libevdev.hash | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package/libevdev/libevdev.hash diff --git a/package/libevdev/libevdev.hash b/package/libevdev/libevdev.hash new file mode 100644 index 000000000..b53a4cea6 --- /dev/null +++ b/package/libevdev/libevdev.hash @@ -0,0 +1,2 @@ +# Hash from http://lists.freedesktop.org/archives/input-tools/2014-November/001123.html +sha256 4b7c76195f0087023142f26c5fd2c254b35c861880c6902d3dd9b27daeec2643 libevdev-1.3.1.tar.xz From 4b8bab325381277af07f66792fb9ccbfd8e96de4 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 14 Nov 2014 19:31:14 +0100 Subject: [PATCH 033/105] evemu: bump version to 2.1.0 See [1] for details. Change download url and source package format to enable usage of upstream provided hash values. Patches - evemu-0001-SYN_MAX.patch - evemu-0003-make-event-names-use-input.h-from-sysroot-instead-of.patch are obsolete as there is no more host side python script for event name generation. Patches - evemu-0002-configure.ac-add-disable-tests-option.patch - evemu-0005-configure.ac-add-disable-python-bindings-option.patch are committed upstream. [1] http://lists.freedesktop.org/archives/input-tools/2014-November/001122.html [Thomas: drop EVEMU_AUTORECONF = YES, since we're now using a tarball that has the configure script already generated, and we no longer have patches touching the configure.ac/Makefile.am] Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/evemu/evemu-0001-SYN_MAX.patch | 25 ---------- ...onfigure.ac-add-disable-tests-option.patch | 44 ------------------ ...-use-input.h-from-sysroot-instead-of.patch | 30 ------------ ...c-add-disable-python-bindings-option.patch | 46 ------------------- package/evemu/evemu.mk | 16 ++----- 5 files changed, 3 insertions(+), 158 deletions(-) delete mode 100644 package/evemu/evemu-0001-SYN_MAX.patch delete mode 100644 package/evemu/evemu-0002-configure.ac-add-disable-tests-option.patch delete mode 100644 package/evemu/evemu-0003-make-event-names-use-input.h-from-sysroot-instead-of.patch delete mode 100644 package/evemu/evemu-0005-configure.ac-add-disable-python-bindings-option.patch diff --git a/package/evemu/evemu-0001-SYN_MAX.patch b/package/evemu/evemu-0001-SYN_MAX.patch deleted file mode 100644 index b128794f7..000000000 --- a/package/evemu/evemu-0001-SYN_MAX.patch +++ /dev/null @@ -1,25 +0,0 @@ -[PATCH] make-event-names.py: fix SYN_MAX definition for modern kernel headers - -SYN_MAX has been exported to user space since 3.12 (52764fed5: Input: add -SYN_MAX and SYN_CNT constants), so only define it locally if not already -defined, otherwise the build breaks. - -Signed-off-by: Peter Korsgaard ---- - src/make-event-names.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/make-event-names.py b/src/make-event-names.py -index bc77f2c..2d0924d 100755 ---- a/src/make-event-names.py -+++ b/src/make-event-names.py -@@ -92,7 +92,9 @@ def print_mapping_table(bits): - print("#ifndef EVENT_NAMES_H") - print("#define EVENT_NAMES_H") - print("") -+ print("#ifndef SYN_MAX") - print("#define SYN_MAX 3 /* linux/input.h doesn't define that */") -+ print("#endif") - print("") - - for prefix in prefixes: diff --git a/package/evemu/evemu-0002-configure.ac-add-disable-tests-option.patch b/package/evemu/evemu-0002-configure.ac-add-disable-tests-option.patch deleted file mode 100644 index c470c44f9..000000000 --- a/package/evemu/evemu-0002-configure.ac-add-disable-tests-option.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 628835a5addbe3dbf49fbd221b3785518c7b26ac Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sun, 27 Apr 2014 13:14:51 +0200 -Subject: [PATCH] configure.ac: add '--disable-tests' option - -Signed-off-by: Peter Seiderer ---- - Makefile.am | 2 +- - configure.ac | 9 +++++++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 7b68f3d..a83b35f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = src tools python test -+SUBDIRS = src tools python $(SUBDIR_TESTS) - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = evemu.pc -diff --git a/configure.ac b/configure.ac -index 239811c..c7e16b3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -45,6 +45,15 @@ if test "x$XMLTO" = "x" || test "x$ASCIIDOC" = "x"; then - AC_MSG_WARN([xmlto or asciidoc not found - cannot create man pages without it]) - fi - -+AC_ARG_ENABLE([tests], -+ AS_HELP_STRING([--disable-tests], [Disable running tests])) -+ -+AS_IF([test "x$enable_tests" != "xno"], [ -+ SUBDIR_TESTS=test -+]) -+ -+AC_SUBST([SUBDIR_TESTS]) -+ - AC_SUBST(AM_CFLAGS, - "-Wall -Wextra") - --- -1.8.1.4 - diff --git a/package/evemu/evemu-0003-make-event-names-use-input.h-from-sysroot-instead-of.patch b/package/evemu/evemu-0003-make-event-names-use-input.h-from-sysroot-instead-of.patch deleted file mode 100644 index 5ac3e7451..000000000 --- a/package/evemu/evemu-0003-make-event-names-use-input.h-from-sysroot-instead-of.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6e0a0631d97b17a82f6ce1996bcb49ee2dbe1544 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 25 Apr 2014 22:30:06 +0200 -Subject: [PATCH] make-event-names: use input.h from sysroot (instead of host - system version) - -Signed-off-by: Peter Seiderer ---- - src/make-event-names.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/make-event-names.py b/src/make-event-names.py -index 2d0924d..945d473 100755 ---- a/src/make-event-names.py -+++ b/src/make-event-names.py -@@ -10,8 +10,10 @@ from __future__ import print_function - import argparse - import re - import sys -+import os - --SOURCE_FILE = "/usr/include/linux/input.h" -+# environment variable SYSROOT set by buildroot for cross-compilation -+SOURCE_FILE = os.environ.get('SYSROOT', '') + "/usr/include/linux/input.h" - - class Bits(object): - pass --- -1.8.1.4 - diff --git a/package/evemu/evemu-0005-configure.ac-add-disable-python-bindings-option.patch b/package/evemu/evemu-0005-configure.ac-add-disable-python-bindings-option.patch deleted file mode 100644 index 177d01829..000000000 --- a/package/evemu/evemu-0005-configure.ac-add-disable-python-bindings-option.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4618fb3b788715c754872df5fed7bce0186f5089 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sun, 27 Apr 2014 13:23:41 +0200 -Subject: [PATCH] configure.ac: add '--disable-python-bindings' option - -Signed-off-by: Peter Seiderer ---- - Makefile.am | 2 +- - configure.ac | 11 +++++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index a83b35f..fb87c76 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = src tools python $(SUBDIR_TESTS) -+SUBDIRS = src tools $(SUBDIR_PYTHON_BINDINGS) $(SUBDIR_TESTS) - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = evemu.pc -diff --git a/configure.ac b/configure.ac -index c7e16b3..72c5fdf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,6 +54,17 @@ AS_IF([test "x$enable_tests" != "xno"], [ - - AC_SUBST([SUBDIR_TESTS]) - -+AC_ARG_ENABLE([python-bindings], -+ AS_HELP_STRING([--disable-python-bindings], -+ [Disable generation of python bindings])) -+ -+AS_IF([test "x$enable_python_bindings" != "xno"], [ -+ SUBDIR_PYTHON_BINDINGS=python -+]) -+ -+AC_SUBST([SUBDIR_PYTHON_BINDINGS]) -+ -+ - AC_SUBST(AM_CFLAGS, - "-Wall -Wextra") - --- -1.8.1.4 - diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk index 368eb8a76..9acdbe24f 100644 --- a/package/evemu/evemu.mk +++ b/package/evemu/evemu.mk @@ -4,8 +4,9 @@ # ################################################################################ -EVEMU_VERSION = 2.0.0 -EVEMU_SITE = http://cgit.freedesktop.org/evemu/snapshot +EVEMU_VERSION = 2.1.0 +EVEMU_SITE = http://www.freedesktop.org/software/evemu +EVEMU_SOURCE = evemu-$(EVEMU_VERSION).tar.xz EVEMU_LICENSE = LGPLv3 (library), GPLv3 (tools) EVEMU_LICENSE_FILES = COPYING COPYING.GPL3 @@ -14,19 +15,12 @@ EVEMU_LICENSE_FILES = COPYING COPYING.GPL3 # which doesn't have all the needed modules enabled, breaking the build EVEMU_CONF_ENV = ac_cv_path_ASCIIDOC="" -# needed for make-event-names.py to find sysroot provided input.h (instead -# of host system version) -EVEMU_MAKE_ENV = SYSROOT=$(STAGING_DIR) - # disable tests generation because of C++ dependency EVEMU_CONF_OPTS += --disable-tests # Uses PKG_CHECK_MODULES() in configure.ac EVEMU_DEPENDENCIES = host-pkgconf libevdev -# Needs Python for header file generation -EVEMU_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) - # Check for target python ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) EVEMU_CONF_OPTS += --enable-python-bindings @@ -35,8 +29,4 @@ else EVEMU_CONF_OPTS += --disable-python-bindings endif -# package source code coming from git, so it doesn't have generated -# configure and Makefile.in -EVEMU_AUTORECONF = YES - $(eval $(autotools-package)) From 3784634fb9de205919a7ded9278e90761daa374b Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 14 Nov 2014 19:31:15 +0100 Subject: [PATCH 034/105] evemu: add hash Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/evemu/evemu.hash | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package/evemu/evemu.hash diff --git a/package/evemu/evemu.hash b/package/evemu/evemu.hash new file mode 100644 index 000000000..99668b7e5 --- /dev/null +++ b/package/evemu/evemu.hash @@ -0,0 +1,2 @@ +# Hash from http://lists.freedesktop.org/archives/input-tools/2014-November/001125.html +sha256 0c87360882751356e9f977ebf7438c00fe97deb232ac725dd86e5ba78203ee97 evemu-2.1.0.tar.xz From cd331c1e1d15e7832f6eebc5c1e9c0a2dd34f033 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 19 Nov 2014 14:21:05 +0100 Subject: [PATCH 035/105] package/python-*: drop redundant python || python3 dependencies As discussed on the list: http://lists.busybox.net/pipermail/buildroot/2014-November/112509.html We currently have a mix of python packages explicitly depending on python || python3 in their Config.in and packages that don't. As all python packages are inside a python || python3 conditional in the main Config.in, the explicit dependencies inside the package Config.in is redundant, so drop it for consistency. Automated using: sed -i '/depends on BR2_PACKAGE_PYTHON.*PYTHON3/d' package/python-*/Config.in Signed-off-by: Peter Korsgaard --- package/python-bottle/Config.in | 1 - package/python-cffi/Config.in | 1 - package/python-configshell-fb/Config.in | 1 - package/python-ipython/Config.in | 1 - package/python-libconfig/Config.in | 1 - package/python-pyasn/Config.in | 1 - package/python-pycrypto/Config.in | 1 - package/python-pyparsing/Config.in | 1 - package/python-pysnmp-apps/Config.in | 1 - package/python-pysnmp-mibs/Config.in | 1 - package/python-pysnmp/Config.in | 1 - package/python-rtslib-fb/Config.in | 1 - package/python-serial/Config.in | 1 - package/python-urwid/Config.in | 1 - 14 files changed, 14 deletions(-) diff --git a/package/python-bottle/Config.in b/package/python-bottle/Config.in index 7b13c1d67..f9b60ca72 100644 --- a/package/python-bottle/Config.in +++ b/package/python-bottle/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BOTTLE bool "python-bottle" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help Bottle is a fast, simple and lightweight WSGI micro web-framework for Python. It is distributed as a single file module and has no diff --git a/package/python-cffi/Config.in b/package/python-cffi/Config.in index f18ed96f6..9cbfcfbbb 100644 --- a/package/python-cffi/Config.in +++ b/package/python-cffi/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CFFI bool "python-cffi" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBFFI help This is the Foreign Function Interface for Python calling C diff --git a/package/python-configshell-fb/Config.in b/package/python-configshell-fb/Config.in index fb9676381..85f47a83b 100644 --- a/package/python-configshell-fb/Config.in +++ b/package/python-configshell-fb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CONFIGSHELL_FB bool "python-configshell-fb" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYPARSING select BR2_PACKAGE_PYTHON3_READLINE if BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_READLINE if BR2_PACKAGE_PYTHON diff --git a/package/python-ipython/Config.in b/package/python-ipython/Config.in index 064f0c947..1d92873f8 100644 --- a/package/python-ipython/Config.in +++ b/package/python-ipython/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IPYTHON bool "python-ipython" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help IPython is a command shell for interactive computing in multiple programming languages, originally developed for the Python diff --git a/package/python-libconfig/Config.in b/package/python-libconfig/Config.in index eae6cdafc..7a49d9159 100644 --- a/package/python-libconfig/Config.in +++ b/package/python-libconfig/Config.in @@ -3,7 +3,6 @@ comment "python-libconfig needs a toolchain w/ C++, largefile, threads" config BR2_PACKAGE_PYTHON_LIBCONFIG bool "python-libconfig" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_PYTHON select BR2_PACKAGE_LIBCONFIG diff --git a/package/python-pyasn/Config.in b/package/python-pyasn/Config.in index efdbbc59d..997b737f5 100644 --- a/package/python-pyasn/Config.in +++ b/package/python-pyasn/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYASN bool "python-pyasn" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON diff --git a/package/python-pycrypto/Config.in b/package/python-pycrypto/Config.in index fe545b5f6..e998ecf89 100644 --- a/package/python-pycrypto/Config.in +++ b/package/python-pycrypto/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYCRYPTO bool "python-pycrypto" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_GMP help PyCrypto is a collection of cryptographic algorithms and diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in index 0408e5e44..b926286cc 100644 --- a/package/python-pyparsing/Config.in +++ b/package/python-pyparsing/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYPARSING bool "python-pyparsing" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, diff --git a/package/python-pysnmp-apps/Config.in b/package/python-pysnmp-apps/Config.in index 8edd04c55..b032eba1f 100644 --- a/package/python-pysnmp-apps/Config.in +++ b/package/python-pysnmp-apps/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYSNMP_APPS bool "python-pysnmp-apps" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYSNMP depends on BR2_INSTALL_LIBSTDCPP # pysnmp -> pyasn help diff --git a/package/python-pysnmp-mibs/Config.in b/package/python-pysnmp-mibs/Config.in index cc03676a3..eca17d26a 100644 --- a/package/python-pysnmp-mibs/Config.in +++ b/package/python-pysnmp-mibs/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYSNMP_MIBS bool "python-pysnmp-mibs" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYSNMP depends on BR2_INSTALL_LIBSTDCPP # pysnmp -> pyasn help diff --git a/package/python-pysnmp/Config.in b/package/python-pysnmp/Config.in index 6cf18ee06..c7cdf3892 100644 --- a/package/python-pysnmp/Config.in +++ b/package/python-pysnmp/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYSNMP bool "python-pysnmp" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 depends on BR2_INSTALL_LIBSTDCPP # pyasn select BR2_PACKAGE_PYTHON_PYASN select BR2_PACKAGE_PYTHON_PYCRYPTO diff --git a/package/python-rtslib-fb/Config.in b/package/python-rtslib-fb/Config.in index 119b63bf1..42a610cc5 100644 --- a/package/python-rtslib-fb/Config.in +++ b/package/python-rtslib-fb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_RTSLIB_FB bool "python-rtslib-fb" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help rtslib-fb is an object-based Python library for configuring the LIO generic SCSI target, present in 3.x Linux kernel diff --git a/package/python-serial/Config.in b/package/python-serial/Config.in index 72f556756..09a4c3925 100644 --- a/package/python-serial/Config.in +++ b/package/python-serial/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SERIAL bool "python-serial" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help python-serial is a Python library to access serial ports. diff --git a/package/python-urwid/Config.in b/package/python-urwid/Config.in index 92f7d53d2..f584a9258 100644 --- a/package/python-urwid/Config.in +++ b/package/python-urwid/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_URWID bool "python-urwid" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help Urwid is a console user interface library for Python From 5a22ca1b63a82a548077ab0316f6a058dfabb804 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 19 Nov 2014 17:39:32 +0100 Subject: [PATCH 036/105] libsoup: bump version python3 patch is now upstream. Signed-off-by: Peter Korsgaard --- package/libsoup/libsoup-01-python3-fix.patch | 39 -------------------- package/libsoup/libsoup.mk | 4 +- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 package/libsoup/libsoup-01-python3-fix.patch diff --git a/package/libsoup/libsoup-01-python3-fix.patch b/package/libsoup/libsoup-01-python3-fix.patch deleted file mode 100644 index 682d57c5c..000000000 --- a/package/libsoup/libsoup-01-python3-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 74f27b8305cfbcf9324a07bea93829237c86e687 Mon Sep 17 00:00:00 2001 -From: Ross Lagerwall -Date: Tue, 18 Jun 2013 08:48:44 +0100 -Subject: tld-parser.py: Force file io to use utf-8 - -This fixes an issue where the build would fail with a UnicodeDecodeError -when run in a non-utf8 locale (which is typical in build environments) -using Python 3. - -https://bugzilla.gnome.org/show_bug.cgi?id=702534 - -Patch status: upstream - -Signed-off-by: Baruch Siach - -diff --git a/libsoup/tld-parser.py b/libsoup/tld-parser.py -index c1a0346..5d9d2ba 100755 ---- a/libsoup/tld-parser.py -+++ b/libsoup/tld-parser.py -@@ -5,13 +5,14 @@ - # Based on tld-parser.c Copyright (C) 2012 Igalia S.L. - - import sys -+import codecs - - SOUP_TLD_RULE_NORMAL = 0 - SOUP_TLD_RULE_MATCH_ALL = 1 << 0 - SOUP_TLD_RULE_EXCEPTION = 1 << 1 - --tlds_file = open(sys.argv[1]) --inc_file = open(sys.argv[2], 'w') -+tlds_file = codecs.open(sys.argv[1], encoding='utf-8') -+inc_file = codecs.open(sys.argv[2], 'w', encoding='utf-8') - - first = True - for rule in tlds_file: --- -cgit v0.10.1 - diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 723b6cc79..70f107410 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSOUP_VERSION_MAJOR = 2.43 -LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).1 +LIBSOUP_VERSION_MAJOR = 2.48 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPLv2+ From dd0e3ecb08d76abdcd34ec9930654022d8569e26 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 19 Nov 2014 16:30:22 -0300 Subject: [PATCH 037/105] btrfs-progs: bump to version 3.17.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 0f207b254..f030c176e 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 6c01579c7b858c175aaed6b3b087dadaa38efb8e590a6928f1afe86bb8faaaab btrfs-progs-v3.17.1.tar.xz +sha256 50ecc724a41a6ec9e37a0fbb134d336bdafd7fa24ec69de0c591c211da4456c6 btrfs-progs-v3.17.2.tar.xz diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index d16fa0d9a..357516884 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 3.17.1 +BTRFS_PROGS_VERSION = 3.17.2 BTRFS_PROGS_SITE = https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = acl attr e2fsprogs lzo util-linux zlib From ff9b9adb06bfd8a6db87e7df12693aac02c478d6 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 19 Nov 2014 17:45:46 +0000 Subject: [PATCH 038/105] git: bump version to 2.1.3 - Bump version to 2.1.3 - Add a hash file Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/git/git.hash | 2 ++ package/git/git.mk | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 package/git/git.hash diff --git a/package/git/git.hash b/package/git/git.hash new file mode 100644 index 000000000..3f8db5f10 --- /dev/null +++ b/package/git/git.hash @@ -0,0 +1,2 @@ +# From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc +sha256 fe1b06aefa73e8d86cbd352523fc0950b8904ae2ec47085b22b7880f45de6f57 git-2.1.3.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index 8a69ee5d2..f338438a3 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,8 +4,9 @@ # ################################################################################ -GIT_VERSION = 1.8.5.4 -GIT_SITE = http://git-core.googlecode.com/files +GIT_VERSION = 2.1.3 +GIT_SOURCE = git-$(GIT_VERSION).tar.xz +GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2 LGPLv2.1+ GIT_LICENSE_FILES = COPYING LGPL-2.1 GIT_DEPENDENCIES = zlib host-gettext From 1d547a65d24eb87abfa86f03b8981a561c942fba Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 19 Nov 2014 17:31:20 +0000 Subject: [PATCH 039/105] lvm2: bump version to 2.02.112 - Bump version to 2.02.112 - Update hash value Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/lvm2/lvm2.hash | 2 +- package/lvm2/lvm2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 10f290550..3d02e8380 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,2 +1,2 @@ # From ftp://sources.redhat.com/pub/lvm2/md5.sum -md5 02487ab2a9e02d1ee76fe217183df28a LVM2.2.02.111.tgz +md5 1f4033b750f68b68e9bd66d3661a2c3f LVM2.2.02.112.tgz diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 76c2f8278..bef22fb87 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.02.111 +LVM2_VERSION = 2.02.112 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_INSTALL_STAGING = YES From ba992db9764a76e972f91dfd506060df6835e679 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 19 Nov 2014 14:08:15 +0000 Subject: [PATCH 040/105] sqlite: bump version to 3.8.7.2 - Bump version to 3.8.7.2 - Update hash value Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index ad1b6c524..26516c992 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,2 +1,2 @@ # From http://www.sqlite.org/download.html -sha1 5601be1263842209d7c5dbf6128f1cc0b6bbe2e5 sqlite-autoconf-3080701.tar.gz +sha1 175283383d010709f76fdd13cb0c8c3c329a1c67 sqlite-autoconf-3080702.tar.gz diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index ea8407ca9..aba788eb7 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITE_VERSION = 3080701 +SQLITE_VERSION = 3080702 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2014 SQLITE_LICENSE = Public domain From 0664897fb6fc2093c7e7042d78ada5e88499f22f Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 11 Nov 2014 11:47:43 +0000 Subject: [PATCH 041/105] elfutils: rename patches to follow the new name structure Signed-off-by: Vicente Olivert Riera Reviewed-by: "Yann E. MORIN" Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- .../{elfutils-01-disable-progs.patch => 0001-disable-progs.patch} | 0 .../{elfutils-02-argp-support.patch => 0002-argp-support.patch} | 0 .../{elfutils-03-memcpy-def.patch => 0003-memcpy-def.patch} | 0 package/elfutils/{elfutils-04-fts.patch => 0004-fts.patch} | 0 .../{elfutils-05-disable-po.patch => 0005-disable-po.patch} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename package/elfutils/{elfutils-01-disable-progs.patch => 0001-disable-progs.patch} (100%) rename package/elfutils/{elfutils-02-argp-support.patch => 0002-argp-support.patch} (100%) rename package/elfutils/{elfutils-03-memcpy-def.patch => 0003-memcpy-def.patch} (100%) rename package/elfutils/{elfutils-04-fts.patch => 0004-fts.patch} (100%) rename package/elfutils/{elfutils-05-disable-po.patch => 0005-disable-po.patch} (100%) diff --git a/package/elfutils/elfutils-01-disable-progs.patch b/package/elfutils/0001-disable-progs.patch similarity index 100% rename from package/elfutils/elfutils-01-disable-progs.patch rename to package/elfutils/0001-disable-progs.patch diff --git a/package/elfutils/elfutils-02-argp-support.patch b/package/elfutils/0002-argp-support.patch similarity index 100% rename from package/elfutils/elfutils-02-argp-support.patch rename to package/elfutils/0002-argp-support.patch diff --git a/package/elfutils/elfutils-03-memcpy-def.patch b/package/elfutils/0003-memcpy-def.patch similarity index 100% rename from package/elfutils/elfutils-03-memcpy-def.patch rename to package/elfutils/0003-memcpy-def.patch diff --git a/package/elfutils/elfutils-04-fts.patch b/package/elfutils/0004-fts.patch similarity index 100% rename from package/elfutils/elfutils-04-fts.patch rename to package/elfutils/0004-fts.patch diff --git a/package/elfutils/elfutils-05-disable-po.patch b/package/elfutils/0005-disable-po.patch similarity index 100% rename from package/elfutils/elfutils-05-disable-po.patch rename to package/elfutils/0005-disable-po.patch From 15e06dc473c6ac7ccbae3171be9f3211d5d1f1a1 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 11 Nov 2014 11:47:44 +0000 Subject: [PATCH 042/105] elfutils: bump version to 0.160 - Bump version to 0.160 - Add a hash file - Adapt patches to the new version - Add a new patch to really make -Werror conditional to BUILD_WERROR Signed-off-by: Vicente Olivert Riera Reviewed-by: "Yann E. MORIN" Tested-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/elfutils/0001-disable-progs.patch | 53 ++++---- package/elfutils/0002-argp-support.patch | 121 +++++++++--------- package/elfutils/0003-memcpy-def.patch | 16 ++- package/elfutils/0004-fts.patch | 70 +++++----- package/elfutils/0005-disable-po.patch | 26 ++-- ...e-werror-conditional-to-build-werror.patch | 24 ++++ package/elfutils/elfutils.hash | 3 + package/elfutils/elfutils.mk | 6 +- 8 files changed, 174 insertions(+), 145 deletions(-) create mode 100644 package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch create mode 100644 package/elfutils/elfutils.hash diff --git a/package/elfutils/0001-disable-progs.patch b/package/elfutils/0001-disable-progs.patch index 462de89e3..8772f5ed3 100644 --- a/package/elfutils/0001-disable-progs.patch +++ b/package/elfutils/0001-disable-progs.patch @@ -7,35 +7,18 @@ useful because the programs are often not needed, and also because building the programs against uClibc causes several issues (lack of obstack_printf() in uClibc for example). -Signed-off-by: Thomas Petazzoni +Based on the former patch by Thomas Petazzoni. -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -22,9 +22,13 @@ - - pkginclude_HEADERS = version.h - -+if ENABLE_PROGS -+PROGS_SUBDIR = src -+endif -+ - # Add doc back when we have some real content. - SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \ -- src po tests -+ $(PROGS_SUBDIR) po tests - - EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ - COPYING COPYING-GPLV2 COPYING-LGPLV3 -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -263,6 +263,12 @@ +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vicente Olivert Riera + +diff -rup a/configure.ac b/configure.ac +--- a/configure.ac 2014-11-07 14:54:32.859360779 +0000 ++++ b/configure.ac 2014-11-07 14:47:44.847376394 +0000 +@@ -253,6 +253,12 @@ AC_SUBST([LIBEBL_SUBDIR]) AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR") AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.]) - + +AC_ARG_ENABLE([progs], + AS_HELP_STRING([--enable-progs], [enable progs]), + enable_progs=$enableval, @@ -45,3 +28,21 @@ Index: b/configure.ac dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am dnl conditional and config.h USE_ZLIB/USE_BZLIB #define. save_LIBS="$LIBS" +diff -rup a/Makefile.am b/Makefile.am +--- a/Makefile.am 2014-08-27 10:25:17.000000000 +0100 ++++ b/Makefile.am 2014-11-07 14:51:38.081368550 +0000 +@@ -22,9 +22,13 @@ ACLOCAL_AMFLAGS = -I m4 + + pkginclude_HEADERS = version.h + ++if ENABLE_PROGS ++PROGS_SUBDIR = src ++endif ++ + # Add doc back when we have some real content. + SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \ +- backends src po tests ++ backends $(PROGS_SUBDIR) po tests + + EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ + COPYING COPYING-GPLV2 COPYING-LGPLV3 diff --git a/package/elfutils/0002-argp-support.patch b/package/elfutils/0002-argp-support.patch index f81ac8f9f..c94d26296 100644 --- a/package/elfutils/0002-argp-support.patch +++ b/package/elfutils/0002-argp-support.patch @@ -9,19 +9,21 @@ out. This allows to build elfutils against uClibc with an external argp library. -Signed-off-by: Thomas Petazzoni +Based on the former patch by Thomas Petazzoni. -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -269,6 +269,13 @@ - enable_progs=yes) +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vicente Olivert Riera + +diff -rup a/configure.ac b/configure.ac +--- a/configure.ac 2014-11-07 15:00:38.663627402 +0000 ++++ b/configure.ac 2014-11-07 15:02:30.233539737 +0000 +@@ -259,6 +259,13 @@ AC_ARG_ENABLE([progs], + enable_progs=yes) AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes) - + +AC_CHECK_FUNC([argp_parse]) +if test "$ac_cv_func_argp_parse" != yes; then -+ AC_CHECK_LIB([argp],[argp_parse],ARGP_LIBS=-largp, ++ AC_CHECK_LIB([argp],[argp_parse],ARGP_LIBS=-largp, + AC_MSG_ERROR([No argp_parse function available.])) +fi +AC_SUBST(ARGP_LIBS) @@ -29,64 +31,63 @@ Index: b/configure.ac dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am dnl conditional and config.h USE_ZLIB/USE_BZLIB #define. save_LIBS="$LIBS" -Index: b/src/Makefile.am -=================================================================== ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -98,26 +98,29 @@ - # Buggy old compilers. - readelf_no_Werror = yes - --readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -+readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \ -+ $(ARGP_LIBS) - nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \ +diff -rup a/libdw/Makefile.am b/libdw/Makefile.am +--- a/libdw/Makefile.am 2014-08-27 10:25:17.000000000 +0100 ++++ b/libdw/Makefile.am 2014-11-07 15:09:32.804794962 +0000 +@@ -110,7 +110,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map l + -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ + -Wl,--version-script,$<,--no-undefined \ + -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ +- -ldl $(zip_LIBS) ++ -ldl $(zip_LIBS) $(ARGP_LIBS) + if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi + ln -fs $@ $@.$(VERSION) + +diff -rup a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am 2014-11-07 15:00:35.867579484 +0000 ++++ b/src/Makefile.am 2014-11-07 15:08:47.380013980 +0000 +@@ -94,27 +94,29 @@ readelf_no_Werror = yes + strings_no_Werror = yes + addr2line_no_Wformat = yes + +-readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl ++readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS) + nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \ - $(demanglelib) --size_LDADD = $(libelf) $(libeu) $(libmudflap) --strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl --ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl +-size_LDADD = $(libelf) $(libeu) +-strip_LDADD = $(libebl) $(libelf) $(libeu) -ldl +-ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl + $(demanglelib) $(ARGP_LIBS) -+size_LDADD = $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS) -+strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS) -+ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS) ++size_LDADD = $(libelf) $(libeu) $(ARGP_LIBS) ++strip_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS) ++ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS) if NATIVE_LD # -ldl is always needed for libebl. ld_LDADD += libld_elf.a endif ld_LDFLAGS = -rdynamic --elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl --findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) --addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) --elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl --objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl --ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) --strings_LDADD = $(libelf) $(libeu) $(libmudflap) --ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) --unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl -+elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS) -+findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) $(ARGP_LIBS) -+addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) $(ARGP_LIBS) -+elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl $(ARGP_LIBS) -+objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \ +-elflint_LDADD = $(libebl) $(libelf) $(libeu) -ldl +-findtextrel_LDADD = $(libdw) $(libelf) +-addr2line_LDADD = $(libdw) $(libelf) +-elfcmp_LDADD = $(libebl) $(libelf) -ldl +-objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) -ldl +-ranlib_LDADD = libar.a $(libelf) $(libeu) +-strings_LDADD = $(libelf) $(libeu) +-ar_LDADD = libar.a $(libelf) $(libeu) +-unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl +-stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl $(demanglelib) ++elflint_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS) ++findtextrel_LDADD = $(libdw) $(libelf) $(ARGP_LIBS) ++addr2line_LDADD = $(libdw) $(libelf) $(ARGP_LIBS) ++elfcmp_LDADD = $(libebl) $(libelf) -ldl $(ARGP_LIBS) ++objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) -ldl \ + $(ARGP_LIBS) -+ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS) -+strings_LDADD = $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS) -+ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS) -+unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl \ -+ $(ARGP_LIBS) - ++ranlib_LDADD = libar.a $(libelf) $(libeu) $(ARGP_LIBS) ++strings_LDADD = $(libelf) $(libeu) $(ARGP_LIBS) ++ar_LDADD = libar.a $(libelf) $(libeu) $(ARGP_LIBS) ++unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl $(ARGP_LIBS) ++stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl \ ++ $(demanglelib) $(ARGP_LIBS) + ldlex.o: ldscript.c ldlex_no_Werror = yes -Index: b/libdw/Makefile.am -=================================================================== ---- a/libdw/Makefile.am -+++ b/libdw/Makefile.am -@@ -111,7 +111,7 @@ - -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ - -Wl,--version-script,$<,--no-undefined \ - -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ -- -ldl $(zip_LIBS) -+ -ldl $(zip_LIBS) $(ARGP_LIBS) - if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi - ln -fs $@ $@.$(VERSION) - diff --git a/package/elfutils/0003-memcpy-def.patch b/package/elfutils/0003-memcpy-def.patch index eb50cf654..509482774 100644 --- a/package/elfutils/0003-memcpy-def.patch +++ b/package/elfutils/0003-memcpy-def.patch @@ -4,21 +4,23 @@ For some reason, libelf uses the internal glibc alias __memcpy, which doesn't exist in uClibc. Add a manual alias so that the build can proceed with uClibc. -Signed-off-by: Thomas Petazzoni +Based on the former patch by Thomas Petazzoni. -Index: b/libelf/libelf.h -=================================================================== ---- a/libelf/libelf.h -+++ b/libelf/libelf.h +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vicente Olivert Riera + +diff -rup a/libelf/libelf.h b/libelf/libelf.h +--- a/libelf/libelf.h 2014-08-27 10:25:17.000000000 +0100 ++++ b/libelf/libelf.h 2014-11-07 15:13:08.743508221 +0000 @@ -34,6 +34,11 @@ /* Get the ELF types. */ #include - + +#ifndef _LIBC +#ifndef __mempcpy +#define __mempcpy mempcpy +#endif +#endif - + /* Known translation types. */ typedef enum diff --git a/package/elfutils/0004-fts.patch b/package/elfutils/0004-fts.patch index 7318236d2..fd7c0b22f 100644 --- a/package/elfutils/0004-fts.patch +++ b/package/elfutils/0004-fts.patch @@ -22,16 +22,18 @@ So we have several options here: Of course, the fts_*() functions are only built if they are not already provided by the C library. -Signed-off-by: Thomas Petazzoni +Based on the former patch by Thomas Petazzoni. -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -276,6 +276,10 @@ +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vicente Olivert Riera + +diff -Nrup a/configure.ac b/configure.ac +--- a/configure.ac 2014-11-07 15:14:42.402119092 +0000 ++++ b/configure.ac 2014-11-07 15:16:50.161316781 +0000 +@@ -266,6 +266,10 @@ if test "$ac_cv_func_argp_parse" != yes; fi AC_SUBST(ARGP_LIBS) - + +AC_CHECK_HEADER([fts.h], + AC_DEFINE([HAVE_FTS_H], [], [Define if is available in C library])) +AM_CONDITIONAL(HAVE_FTS, test "$ac_cv_header_fts_h" = yes) @@ -39,24 +41,9 @@ Index: b/configure.ac dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am dnl conditional and config.h USE_ZLIB/USE_BZLIB #define. save_LIBS="$LIBS" -Index: b/libdwfl/Makefile.am -=================================================================== ---- a/libdwfl/Makefile.am -+++ b/libdwfl/Makefile.am -@@ -79,6 +79,9 @@ - if LZMA - libdwfl_a_SOURCES += lzma.c - endif -+if !HAVE_FTS -+libdwfl_a_SOURCES += fts.c -+endif - - if MUDFLAP - libdwfl = libdwfl.a $(libdw) $(libebl) $(libelf) $(libeu) -Index: b/libdwfl/fts.c -=================================================================== ---- /dev/null -+++ b/libdwfl/fts.c +diff -Nrup a/libdwfl/fts.c b/libdwfl/fts.c +--- a/libdwfl/fts.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/libdwfl/fts.c 2014-11-07 15:25:08.325879956 +0000 @@ -0,0 +1,1095 @@ +/*- + * Copyright (c) 1990, 1993, 1994 @@ -1153,10 +1140,9 @@ Index: b/libdwfl/fts.c + errno = oerrno; + return (ret); +} -Index: b/libdwfl/fts_.h -=================================================================== ---- /dev/null -+++ b/libdwfl/fts_.h +diff -Nrup a/libdwfl/fts_.h b/libdwfl/fts_.h +--- a/libdwfl/fts_.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/libdwfl/fts_.h 2014-11-07 15:26:00.806777392 +0000 @@ -0,0 +1,131 @@ +/* + * Copyright (c) 1989, 1993 @@ -1289,19 +1275,31 @@ Index: b/libdwfl/fts_.h +__END_DECLS + +#endif /* fts.h */ -Index: b/libdwfl/linux-kernel-modules.c -=================================================================== ---- a/libdwfl/linux-kernel-modules.c -+++ b/libdwfl/linux-kernel-modules.c +diff -Nrup a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c +--- a/libdwfl/linux-kernel-modules.c 2014-08-27 10:25:17.000000000 +0100 ++++ b/libdwfl/linux-kernel-modules.c 2014-11-07 15:27:10.783974209 +0000 @@ -29,7 +29,11 @@ /* We include this before config.h because it can't handle _FILE_OFFSET_BITS. Everything we need here is fine if its declarations just come first. */ - + +#ifdef HAVE_FTS_H #include +#else +#include "fts_.h" +#endif - + #include - + +diff -Nrup a/libdwfl/Makefile.am b/libdwfl/Makefile.am +--- a/libdwfl/Makefile.am 2014-08-27 10:25:17.000000000 +0100 ++++ b/libdwfl/Makefile.am 2014-11-07 15:17:57.682478408 +0000 +@@ -79,6 +79,9 @@ endif + if LZMA + libdwfl_a_SOURCES += lzma.c + endif ++if !HAVE_FTS ++libdwfl_a_SOURCES += fts.c ++endif + + libdwfl = $(libdw) + libdw = ../libdw/libdw.so diff --git a/package/elfutils/0005-disable-po.patch b/package/elfutils/0005-disable-po.patch index d98da0b0f..c45c58046 100644 --- a/package/elfutils/0005-disable-po.patch +++ b/package/elfutils/0005-disable-po.patch @@ -5,18 +5,20 @@ been generated with gettext 0.17, while we use gettext 0.18 in Buildroot. Since we don't care that much about po files anyway, just disable the build of this directory. -Signed-off-by: Thomas Petazzoni +Based on the former patch by Thomas Petazzoni. + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vicente Olivert Riera + +diff -rup a/Makefile.am b/Makefile.am +--- a/Makefile.am 2014-11-07 15:14:39.018060884 +0000 ++++ b/Makefile.am 2014-11-07 15:30:02.864918229 +0000 +@@ -28,7 +28,7 @@ endif -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -28,7 +28,7 @@ - # Add doc back when we have some real content. - SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \ -- $(PROGS_SUBDIR) po tests -+ $(PROGS_SUBDIR) tests - + SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \ +- backends $(PROGS_SUBDIR) po tests ++ backends $(PROGS_SUBDIR) tests + EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ - COPYING COPYING-GPLV2 COPYING-LGPLV3 + COPYING COPYING-GPLV2 COPYING-LGPLV3 diff --git a/package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch b/package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch new file mode 100644 index 000000000..59aae5e8b --- /dev/null +++ b/package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch @@ -0,0 +1,24 @@ +Really make -Werror conditional to BUILD_WERROR + +Otherwise it will fail with an error message like this one: + +elf_getarsym.c:290:9: error: 'n' may be used uninitialized in this +function [-Werror=maybe-uninitialized] + arsym[n].as_name = NULL; + ^ +cc1: all warnings being treated as errors + +Signed-off-by: "Yann E. MORIN" +Signed-off-by: Vicente Olivert Riera + +diff -rup a/config/eu.am b/config/eu.am +--- a/config/eu.am 2014-11-10 16:19:14.356031479 +0000 ++++ b/config/eu.am 2014-11-10 16:21:11.702072011 +0000 +@@ -35,7 +35,6 @@ LD_AS_NEEDED = @LD_AS_NEEDED@ + DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"' + AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. + AM_CFLAGS = -std=gnu99 -Wall -Wshadow \ +- $(if $($(*F)_no_Werror),,-Werror) \ + $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \ + $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \ + $($(*F)_CFLAGS) diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash new file mode 100644 index 000000000..f0f459831 --- /dev/null +++ b/package/elfutils/elfutils.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1 elfutils-0.160.tar.bz2 +sha256 feb307acf472598ea7af4e4b439251613a8f5d81e804b4abf9aeca195a5d4254 elfutils-portability.patch diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 4f00a27a6..4914b3b6f 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELFUTILS_VERSION = 0.155 +ELFUTILS_VERSION = 0.160 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://fedorahosted.org/releases/e/l/elfutils/$(ELFUTILS_VERSION) ELFUTILS_LICENSE = GPLv3 GPLv2 LGPLv3 @@ -13,9 +13,7 @@ ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3 # The tarball does not have a generated configure script ELFUTILS_AUTORECONF = YES ELFUTILS_CONF_OPTS += --disable-werror -ELFUTILS_PATCH = \ - elfutils-portability.patch \ - elfutils-robustify.patch +ELFUTILS_PATCH = elfutils-portability.patch ELFUTILS_INSTALL_STAGING = YES From 3c79d8adf4cd987476b02fbb1565c1848c44ffb7 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 18 Nov 2014 14:01:56 -0300 Subject: [PATCH 043/105] dhcpcd: use standard installation Drop the custom/manual install cmds and do a normal make install. This gets dhcpcd-hooks installed which are useful for many accesory setup functions like dns, ntp server, and so on. Also install dhcpcd to /sbin since it's expected by debian ifupdown, For busybox ifupdown when external dhcp clients are enabled (not in the default config we ship) will search the path. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/dhcpcd/dhcpcd.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index 3bb7a135f..975742136 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -35,12 +35,7 @@ define DHCPCD_BUILD_CMDS endef define DHCPCD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/dhcpcd \ - $(TARGET_DIR)/usr/sbin/dhcpcd - $(INSTALL) -D -m 0644 $(@D)/dhcpcd.conf \ - $(TARGET_DIR)/etc/dhcpcd.conf - $(INSTALL) -D -m 0755 $(@D)/dhcpcd-run-hooks \ - $(TARGET_DIR)/libexec/dhcpcd-run-hooks + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) endef # NOTE: Even though this package has a configure script, it is not generated From 4859f979b2394086761260071049b1ee6419d4ea Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 18 Nov 2014 14:01:57 -0300 Subject: [PATCH 044/105] network-manager: adjust dhclient and dhcpcd directories dhclient and dhcpcd were moved from /usr/sbin to /sbin for busybox-less SysV-style init with Debian utilities, so adjust accordingly. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 79442543d..9770cae94 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -56,11 +56,11 @@ else endif ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/usr/sbin/dhclient +NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient endif ifeq ($(BR2_PACKAGE_DHCPCD),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/usr/sbin/dhcpcd +NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd endif # uClibc by default doesn't have backtrace support, so don't use it From 3cd5b136c51e7ecddbce50dbe2ac8bc84d948d73 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 18 Nov 2014 14:01:55 -0300 Subject: [PATCH 045/105] dhcpcd: bump to version 6.6.2 Also add hash file. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/dhcpcd/dhcpcd.hash | 2 ++ package/dhcpcd/dhcpcd.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 package/dhcpcd/dhcpcd.hash diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash new file mode 100644 index 000000000..c8ae06490 --- /dev/null +++ b/package/dhcpcd/dhcpcd.hash @@ -0,0 +1,2 @@ +# Locally calculated from download (no sig, hash) +sha256 879c81febafc95ed9353909b719af765e9925c6cb06226b79da6c0dd176fe89f dhcpcd-6.6.2.tar.bz2 diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index 975742136..c06002f7b 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCPCD_VERSION = 6.4.7 +DHCPCD_VERSION = 6.6.2 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.bz2 DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd DHCPCD_DEPENDENCIES = host-pkgconf From 1595d6b531600fa20eeba06c0584c383c29fe0f8 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Sat, 15 Nov 2014 17:29:16 +0100 Subject: [PATCH 046/105] package/*/*.mk: Fix indent Change LIBFOO_PERMISSIONS everywhere to be a space-separated list. As nothing was specified in the manual but all our lists are space separated, there is no reason that this one should be made an exception. Signed-off-by: Maxime Hadjinlian Tested-by: "Yann E. MORIN" Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/busybox/busybox.mk | 4 ++-- package/nginx/nginx.mk | 2 +- package/sudo/sudo.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 0ceaab17f..f0fa85199 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -50,8 +50,8 @@ BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig BUSYBOX_KCONFIG_OPTS = $(BUSYBOX_MAKE_OPTS) define BUSYBOX_PERMISSIONS - /bin/busybox f 4755 0 0 - - - - - - /usr/share/udhcpc/default.script f 755 0 0 - - - - - + /bin/busybox f 4755 0 0 - - - - - + /usr/share/udhcpc/default.script f 755 0 0 - - - - - endef # If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 5a65c5226..55ae8442f 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -25,7 +25,7 @@ NGINX_CONF_OPTS = \ # So, we just need to create the directories used by nginx with the right # ownership. define NGINX_PERMISSIONS - /var/lib/nginx d 755 33 33 - - - - - + /var/lib/nginx d 755 33 33 - - - - - endef # disable external libatomic_ops because its detection fails. diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 283a40ca6..61635ecca 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -29,7 +29,7 @@ endef SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST define SUDO_PERMISSIONS - /usr/bin/sudo f 4755 0 0 - - - - - + /usr/bin/sudo f 4755 0 0 - - - - - endef $(eval $(autotools-package)) From 98c6ad3a8a30b4ace69ff3e5b6eac35c0cc71b72 Mon Sep 17 00:00:00 2001 From: Nicolas Serafini Date: Fri, 7 Nov 2014 11:48:14 +0100 Subject: [PATCH 047/105] exiv2: new package Add support for Exiv2 library and utility to manage image metadata Exiv2 can be built in GPLv2+ or commercial version. But in commercial version the Nikon lens name database and the NLS support has to be disabled for copyright reason. [Thomas: - switch to using the CMake build system, which works better than the clunky autoconf + manual Makefile based build system. - add missing toolchains dependencies: does not build in static library configuration, needs C++, etc.] Signed-off-by: Nicolas Serafini Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/exiv2/Config.in | 57 ++++++++++++++++++++++++++++++++++++++++ package/exiv2/exiv2.hash | 4 +++ package/exiv2/exiv2.mk | 47 +++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+) create mode 100644 package/exiv2/Config.in create mode 100644 package/exiv2/exiv2.hash create mode 100644 package/exiv2/exiv2.mk diff --git a/package/Config.in b/package/Config.in index a6977ce8c..e91e95b16 100644 --- a/package/Config.in +++ b/package/Config.in @@ -632,6 +632,7 @@ menu "Graphics" source "package/adwaita-icon-theme/Config.in" source "package/atk/Config.in" source "package/cairo/Config.in" + source "package/exiv2/Config.in" source "package/fltk/Config.in" source "package/fontconfig/Config.in" source "package/freetype/Config.in" diff --git a/package/exiv2/Config.in b/package/exiv2/Config.in new file mode 100644 index 000000000..3dc74459a --- /dev/null +++ b/package/exiv2/Config.in @@ -0,0 +1,57 @@ +comment "exiv2 needs a toolchain w/ C++, dynamic library" + depends on BR2_PREFER_STATIC_LIB || !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_EXIV2 + bool "exiv2" + depends on !BR2_PREFER_STATIC_LIB + depends on BR2_INSTALL_LIBSTDCPP + help + Exiv2 is a C++ library and a command line utility to manage + image metadata. It provides fast and easy read and write + access to the Exif, IPTC and XMP metadata of images in + various formats. + + Exiv2 is available under the GPLv2+ or under a commercial + license. + + http://www.exiv2.org/ + +if BR2_PACKAGE_EXIV2 + +config BR2_PACKAGE_EXIV2_COMMERCIAL + bool "Enable commercial" + help + Build the commercial version for closed source project. + + The Nikon lens name database and the NLS support is disabled + for copyright reasons. + + A commercial license request is needed. + http://www.exiv2.org/download.html#license + +config BR2_PACKAGE_EXIV2_PNG + bool "PNG image support" + select BR2_PACKAGE_ZLIB + help + Build with PNG image support + +config BR2_PACKAGE_EXIV2_XMP + bool "XMP support" + select BR2_PACKAGE_EXPAT + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Build with XMP support + +comment "xmp support needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_EXIV2_LENSDATA + bool "Nikon lens name database" + depends on !BR2_PACKAGE_EXIV2_COMMERCIAL + help + Integrate Nikon lens name database. + + This database is integrated but comes from a thirdparty: + http://www.rottmerhusen.com/objektives/lensid/thirdparty.html. + +endif diff --git a/package/exiv2/exiv2.hash b/package/exiv2/exiv2.hash new file mode 100644 index 000000000..d4f8c6076 --- /dev/null +++ b/package/exiv2/exiv2.hash @@ -0,0 +1,4 @@ +# From http://www.exiv2.org/download.html +md5 b8a23dc56a98ede85c00718a97a8d6fc exiv2-0.24.tar.gz +# Locally calculated +sha256 f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e exiv2-0.24.tar.gz diff --git a/package/exiv2/exiv2.mk b/package/exiv2/exiv2.mk new file mode 100644 index 000000000..93e36f725 --- /dev/null +++ b/package/exiv2/exiv2.mk @@ -0,0 +1,47 @@ +################################################################################ +# +# exiv2 +# +################################################################################ + +EXIV2_VERSION = 0.24 +EXIV2_SITE = http://www.exiv2.org +EXIV2_INSTALL_STAGING = YES + +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_BUILD_SAMPLES=OFF + +ifeq ($(BR2_PACKAGE_EXIV2_LENSDATA),) +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_LENSDATA=OFF +endif + +ifeq ($(BR2_PACKAGE_EXIV2_COMMERCIAL),y) +EXIV2_LICENSE = commercial +# NLS support is disabled in commercial version due to the copyright +# of the translated texts. +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_COMMERCIAL=ON -DEXIV2_ENABLE_NLS=OFF +else +EXIV2_LICENSE = GPLv2+ +EXIV2_LICENSE_FILES = COPYING +endif + +ifeq ($(BR2_PACKAGE_EXIV2_PNG),y) +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_PNG=ON +EXIV2_DEPENDENCIES += zlib +else +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_PNG=OFF +endif + +ifeq ($(BR2_PACKAGE_EXIV2_XMP),y) +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=ON -DEXIV2_ENABLE_LIBXMP=ON +EXIV2_DEPENDENCIES += expat +else +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=OFF -DEXIV2_ENABLE_LIBXMP=OFF +endif + +ifeq ($(BR2_ENABLE_LOCALE),y) +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_NLS=ON +else +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_NLS=OFF +endif + +$(eval $(cmake-package)) From ea469fe620db1a5a7f914b366fb4924215417d5c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 22 Nov 2014 13:01:11 +0100 Subject: [PATCH 048/105] package/mesa3d: bump version to 10.3.4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d/mesa3d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 4eaf07c7e..8dfad6cc5 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESA3D_VERSION = 10.3.3 +MESA3D_VERSION = 10.3.4 MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.bz2 MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos From 00152b6a1fe760c1fd9ad54618af484517272f8b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 21 Nov 2014 21:59:06 +0100 Subject: [PATCH 049/105] mcelog: new package [Thomas: - use "make install", which allows to remove the custom installation logic in mcelog.mk. - no need to explicitly pass CFLAGS and CPPFLAGS when doing the build, since those definitions are already part of $(TARGET_CONFIGURE_OPTS).] Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/mcelog/Config.in | 9 +++++++++ package/mcelog/mcelog.mk | 21 +++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 package/mcelog/Config.in create mode 100644 package/mcelog/mcelog.mk diff --git a/package/Config.in b/package/Config.in index e91e95b16..9188041e0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -76,6 +76,7 @@ endif source "package/lttng-babeltrace/Config.in" source "package/lttng-modules/Config.in" source "package/lttng-tools/Config.in" + source "package/mcelog/Config.in" source "package/memstat/Config.in" source "package/netperf/Config.in" source "package/oprofile/Config.in" diff --git a/package/mcelog/Config.in b/package/mcelog/Config.in new file mode 100644 index 000000000..f3ccc71e8 --- /dev/null +++ b/package/mcelog/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_MCELOG + bool "mcelog" + depends on BR2_i386 || BR2_x86_64 + depends on BR2_USE_MMU # fork() + help + mcelog processes machine checks (in particular memory and CPU hardware + errors) on modern x86 Linux systems. + + http://www.mcelog.org/ diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk new file mode 100644 index 000000000..da338bace --- /dev/null +++ b/package/mcelog/mcelog.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# mcelog +# +################################################################################ + +MCELOG_VERSION = v105 +MCELOG_SITE = $(BR2_KERNEL_MIRROR)/scm/utils/cpu/mce/mcelog.git +MCELOG_SITE_METHOD = git +MCELOG_LICENSE = GPLv2 +MCELOG_LICENSE_FILES = README + +define MCELOG_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all +endef + +define MCELOG_INSTALL_TARGET_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) From 04576d9e55341bb7701d70f25d8cf2c276360acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20Mart=C3=ADnez?= Date: Fri, 21 Nov 2014 13:19:06 -0300 Subject: [PATCH 050/105] nitrogen6x: use install instead of cp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in order to not depend on the previous permissions of each file Signed-off-by: Guido Martínez Signed-off-by: Thomas Petazzoni --- board/boundarydevices/nitrogen6x/post-build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/boundarydevices/nitrogen6x/post-build.sh b/board/boundarydevices/nitrogen6x/post-build.sh index cc6e66acf..2b43aa322 100755 --- a/board/boundarydevices/nitrogen6x/post-build.sh +++ b/board/boundarydevices/nitrogen6x/post-build.sh @@ -8,11 +8,11 @@ BOARD_DIR="$(dirname $0)" # bd u-boot looks for bootscript here -cp $BOARD_DIR/6x_bootscript $TARGET_DIR +install -D -m 0644 $BOARD_DIR/6x_bootscript $TARGET_DIR/6x_bootscript # u-boot / update script for bd upgradeu command if [ -e $BINARIES_DIR/u-boot.imx ]; then - cp $BINARIES_DIR/u-boot.imx $TARGET_DIR - cp $BOARD_DIR/6x_upgrade $TARGET_DIR + install -D -m 0644 $BINARIES_DIR/u-boot.imx $TARGET_DIR/u-boot.imx + install -D -m 0644 $BOARD_DIR/6x_upgrade $TARGET_DIR/6x_upgrade fi From 5dac9fddbf46223d0a5967aa0560a89ee7fbac3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20Mart=C3=ADnez?= Date: Fri, 21 Nov 2014 13:19:07 -0300 Subject: [PATCH 051/105] boot/grub: use install instead of cp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way we don't depend on the permissions of files under boot/grub/, which aren't tracked. While we're at it, change all 'cp' usages into 'install' with the correct mode for each file. Signed-off-by: Guido Martínez Signed-off-by: Thomas Petazzoni --- boot/grub/grub.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk index 535ada637..ae687d6b1 100644 --- a/boot/grub/grub.mk +++ b/boot/grub/grub.mk @@ -81,7 +81,7 @@ GRUB_CONF_OPTS = \ ifeq ($(BR2_TARGET_GRUB_SPLASH),y) define GRUB_INSTALL_SPLASH - cp boot/grub/splash.xpm.gz $(TARGET_DIR)/boot/grub/ + $(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz $(TARGET_DIR)/boot/grub/splash.xpm.gz endef else define GRUB_INSTALL_SPLASH @@ -95,14 +95,14 @@ endif # of a disk or disk image. define GRUB_INSTALL_TARGET_CMDS - install -m 0755 -D $(@D)/grub/grub $(HOST_DIR)/sbin/grub - mkdir -p $(TARGET_DIR)/boot/grub - cp $(@D)/stage1/stage1 $(TARGET_DIR)/boot/grub + $(INSTALL) -D -m 0755 $(@D)/grub/grub $(HOST_DIR)/sbin/grub + $(INSTALL) -D -m 0755 $(@D)/stage1/stage1 $(TARGET_DIR)/boot/grub/stage1 for f in $(GRUB_STAGE_1_5_TO_INSTALL) ; do \ - cp $(@D)/stage2/$${f}_stage1_5 $(TARGET_DIR)/boot/grub ; \ + $(INSTALL) -D -m 0755 $(@D)/stage2/$${f}_stage1_5 \ + $(TARGET_DIR)/boot/grub/$${f}_stage1_5 ; \ done - cp $(@D)/stage2/stage2 $(TARGET_DIR)/boot/grub - cp boot/grub/menu.lst $(TARGET_DIR)/boot/grub + $(INSTALL) -D -m 0644 $(@D)/stage2/stage2 $(TARGET_DIR)/boot/grub/stage2 + $(INSTALL) -D -m 0644 boot/grub/menu.lst $(TARGET_DIR)/boot/grub/menu.lst $(GRUB_INSTALL_SPLASH) endef From 4273d4d9ff5b9c104d7447d96199e2cadbf790e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20Mart=C3=ADnez?= Date: Fri, 21 Nov 2014 13:19:08 -0300 Subject: [PATCH 052/105] fs/iso9660: use install instead of cp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way we don't depend on the permissions of files under boot/ or fs/, which aren't tracked. While we're at it, change all 'cp' usages into 'install' with the correct mode for each file. Signed-off-by: Guido Martínez Signed-off-by: Thomas Petazzoni --- fs/iso9660/iso9660.mk | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index 908f0e981..5b44ba424 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -14,20 +14,22 @@ ROOTFS_ISO9660_DEPENDENCIES = grub host-cdrkit host-fakeroot linux rootfs-cpio $(BINARIES_DIR)/rootfs.iso9660: $(ROOTFS_ISO9660_DEPENDENCIES) @$(call MESSAGE,"Generating root filesystem image rootfs.iso9660") - mkdir -p $(ISO9660_TARGET_DIR) - mkdir -p $(ISO9660_TARGET_DIR)/boot/grub - cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/ - cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst + $(INSTALL) -D -m 0644 $(GRUB_DIR)/stage2/stage2_eltorito \ + $(ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito + $(INSTALL) -D -m 0644 $(ISO9660_BOOT_MENU) \ + $(ISO9660_TARGET_DIR)/boot/grub/menu.lst ifeq ($(BR2_TARGET_GRUB_SPLASH),) $(SED) '/^splashimage/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst else - cp boot/grub/splash.xpm.gz $(ISO9660_TARGET_DIR)/ + $(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz \ + $(ISO9660_TARGET_DIR)/splash.xpm.gz endif - cp $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel + $(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) $(SED) '/initrd/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst else - cp $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) $(ISO9660_TARGET_DIR)/initrd + $(INSTALL) -D -m 0644 $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) \ + $(ISO9660_TARGET_DIR)/initrd endif # Use fakeroot to pretend all target binaries are owned by root rm -f $(FAKEROOT_SCRIPT) From 47667497ec2622263bbd3cacc109beed7e7bea7c Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 20 Nov 2014 10:32:10 -0500 Subject: [PATCH 053/105] python-netifaces: enable on Python 3 Version 0.10.4 is compatible with python 3. [Thomas: change the patch to simply remove the dependency on BR2_PACKAGE_PYTHON, so that the package can be seen when either python or python3 are used.] Signed-off-by: Simon Marchi Signed-off-by: Thomas Petazzoni --- package/python-netifaces/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-netifaces/Config.in b/package/python-netifaces/Config.in index 29f9fc33a..1f54f4bd1 100644 --- a/package/python-netifaces/Config.in +++ b/package/python-netifaces/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_NETIFACES bool "python-netifaces" - depends on BR2_PACKAGE_PYTHON help Portable access to network interfaces from Python. From a8998ae9c545f2fc262f9925f85835a92a86ee5c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Nov 2014 14:53:29 +0100 Subject: [PATCH 054/105] dbus-python: cleanup package The patch is not needed anymore as the proper includes can be specified using PYTHON_INCLUDES, and version/pythondir/pyexecdir is correctly detected using host-python. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...thon-0001-fix-python-configure-check.patch | 27 ------------------- package/dbus-python/dbus-python.mk | 11 +++----- 2 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 package/dbus-python/dbus-python-0001-fix-python-configure-check.patch diff --git a/package/dbus-python/dbus-python-0001-fix-python-configure-check.patch b/package/dbus-python/dbus-python-0001-fix-python-configure-check.patch deleted file mode 100644 index 2df4da888..000000000 --- a/package/dbus-python/dbus-python-0001-fix-python-configure-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -Python: add am_cv_python_includes to override runtime python-config check -[Gustavo: update for dbus-python 1.2.0] - -diff -Nura dbus-python-1.2.0.orig/configure dbus-python-1.2.0/configure ---- dbus-python-1.2.0.orig/configure 2013-05-08 04:48:42.000000000 -0300 -+++ dbus-python-1.2.0/configure 2014-07-03 16:54:25.922727033 -0300 -@@ -11762,6 +11762,12 @@ - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python headers using $PYTHON-config --includes" >&5 - $as_echo_n "checking for Python headers using $PYTHON-config --includes... " >&6; } -+if test "${am_cv_python_includes+set}" = set; then -+ $as_echo_n "(cached) $ECHO_C" >&6 -+ PYTHON_INCLUDES=${am_cv_python_includes} -+ { $as_echo "$as_me:$LINENO: result: $PYTHON_INCLUDES" >&5 -+$as_echo_t "${ECHO_T}$PYTHON_INCLUDES" >&6; } -+else - PYTHON_INCLUDES=`$PYTHON-config --includes` - if test $? = 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_INCLUDES" >&5 -@@ -11781,6 +11787,7 @@ - $as_echo "$PYTHON_INCLUDES" >&6; } - fi - fi -+fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether those headers are sufficient" >&5 - $as_echo_n "checking whether those headers are sufficient... " >&6; } diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk index d4fdfa1ea..bc5768982 100644 --- a/package/dbus-python/dbus-python.mk +++ b/package/dbus-python/dbus-python.mk @@ -10,13 +10,10 @@ DBUS_PYTHON_INSTALL_STAGING = YES DBUS_PYTHON_LICENSE = MIT DBUS_PYTHON_LICENSE_FILES = COPYING -DBUS_PYTHON_CONF_ENV = am_cv_pathless_PYTHON=python \ - ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python \ - am_cv_python_version=$(PYTHON_VERSION) \ - am_cv_python_platform=linux2 \ - am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ - am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ - am_cv_python_includes=-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) +DBUS_PYTHON_CONF_ENV = \ + PYTHON=$(HOST_DIR)/usr/bin/python2 \ + PYTHON_INCLUDES="$(shell $(STAGING_DIR)/usr/bin/python2-config --includes)" \ + PYTHON_LIBS="$(shell $(STAGING_DIR)/usr/bin/python2-config --ldflags)" DBUS_PYTHON_CONF_OPTS = --disable-html-docs --disable-api-docs From fbb8cbfdf4ef0be10d2e9b8e51cde98d2909a120 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Nov 2014 14:53:30 +0100 Subject: [PATCH 055/105] python3: add patch to fix --includes / --ldflags output of python3-config The build/real prefix handling using sed breaks if build != real and the standard include / lib directories are used ($prefix/include and $prefix/lib). E.G. prefix_build="/usr", libdir="$prefix/lib", includedir="$prefix/include". If this gets installed with make DESTDIR="/foo" install, then we end up with prefix_real = prefix = "/foo/usr" as expected, but includedir="/foo/foo/usr/include" and libdir="/foo/foo/usr/lib" because of the double sed invocation (prefix is already expanded). Work around it by ensuring we only match the beginning of the string. Submitted upstream: http://bugs.python.org/issue22907 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...on3-017-python-config-include-libdir.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/python3/python3-017-python-config-include-libdir.patch diff --git a/package/python3/python3-017-python-config-include-libdir.patch b/package/python3/python3-017-python-config-include-libdir.patch new file mode 100644 index 000000000..50a856da4 --- /dev/null +++ b/package/python3/python3-017-python-config-include-libdir.patch @@ -0,0 +1,60 @@ +From 50f34d2cac63b6bf0935294a7d63d9451714f4c4 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Thu, 20 Nov 2014 13:24:59 +0100 +Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match + beginning of strings + +The build/real prefix handling using sed breaks if build != real and the +standard include / lib directories are used ($prefix/include and $prefix/lib). + +E.G. + +prefix_build="/usr", libdir="$prefix/lib", includedir="$prefix/include". + +If this gets installed with make DESTDIR="/foo" install, then we end up with +prefix_real = prefix = "/foo/usr" as expected, but +includedir="/foo/foo/usr/include" and libdir="/foo/foo/usr/lib" because of +the double sed invocation (prefix is already expanded). Work around it by +ensuring we only match the beginning of the string. + +Submitted upstream: http://bugs.python.org/issue22907 + +Signed-off-by: Peter Korsgaard +--- + Misc/python-config.sh.in | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in +index 64c81e5..f75eec5 100644 +--- a/Misc/python-config.sh.in ++++ b/Misc/python-config.sh.in +@@ -29,12 +29,12 @@ prefix_real=$(installed_prefix "$0") + + # Use sed to fix paths from their built-to locations to their installed-to + # locations. +-prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#") ++prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#") + exec_prefix_build="@exec_prefix@" +-exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#") +-includedir=$(echo "@includedir@" | sed "s#$prefix_build#$prefix_real#") +-libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#") +-CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#") ++exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#") ++includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#") ++libdir=$(echo "@libdir@" | sed "s#^$prefix_build#$prefix_real#") ++CFLAGS=$(echo "@CFLAGS@" | sed "s#^$prefix_build#$prefix_real#") + VERSION="@VERSION@" + LIBM="@LIBM@" + LIBC="@LIBC@" +@@ -48,7 +48,7 @@ OPT="@OPT@" + PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" + LDVERSION="@LDVERSION@" + LIBDEST=${prefix}/lib/python${VERSION} +-LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#") ++LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#") + SO="@SO@" + PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" + INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" +-- +2.1.3 + From d1935562e83ef0d221929d935cf3d673435c85cb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Nov 2014 14:53:31 +0100 Subject: [PATCH 056/105] dbus-python: add python3 support [Thomas: update the dependencies of the comment to take into account that we can now also build with Python 3.] Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/dbus-python/Config.in | 7 ++++--- package/dbus-python/dbus-python.mk | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in index a38d27794..332726348 100644 --- a/package/dbus-python/Config.in +++ b/package/dbus-python/Config.in @@ -3,15 +3,16 @@ config BR2_PACKAGE_DBUS_PYTHON depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_PACKAGE_DBUS - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_DBUS_GLIB # pyexpat: runtime dependency only - select BR2_PACKAGE_PYTHON_PYEXPAT + select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 help Python bindings for D-Bus http://dbus.freedesktop.org/doc/dbus-python/ comment "dbus-python needs a toolchain w/ wchar, threads" - depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_DBUS && (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk index bc5768982..1637406c0 100644 --- a/package/dbus-python/dbus-python.mk +++ b/package/dbus-python/dbus-python.mk @@ -9,14 +9,25 @@ DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python DBUS_PYTHON_INSTALL_STAGING = YES DBUS_PYTHON_LICENSE = MIT DBUS_PYTHON_LICENSE_FILES = COPYING +DBUS_PYTHON_DEPENDENCIES = dbus-glib +DBUS_PYTHON_CONF_OPTS = --disable-html-docs --disable-api-docs -DBUS_PYTHON_CONF_ENV = \ +ifeq ($(BR2_PACKAGE_PYTHON),y) +DBUS_PYTHON_DEPENDENCIES += python host-python + +DBUS_PYTHON_CONF_ENV += \ PYTHON=$(HOST_DIR)/usr/bin/python2 \ PYTHON_INCLUDES="$(shell $(STAGING_DIR)/usr/bin/python2-config --includes)" \ PYTHON_LIBS="$(shell $(STAGING_DIR)/usr/bin/python2-config --ldflags)" +else +DBUS_PYTHON_DEPENDENCIES += python3 host-python3 + +DBUS_PYTHON_CONF_ENV += \ + PYTHON=$(HOST_DIR)/usr/bin/python3 \ + PYTHON_INCLUDES="$(shell $(STAGING_DIR)/usr/bin/python3-config --includes)" \ + PYTHON_LIBS="$(shell $(STAGING_DIR)/usr/bin/python3-config --ldflags)" +endif -DBUS_PYTHON_CONF_OPTS = --disable-html-docs --disable-api-docs -DBUS_PYTHON_DEPENDENCIES = dbus-glib python host-python $(eval $(autotools-package)) From 4fc94a76cc6b51ec589accfeee65bed405db028c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 20 Nov 2014 13:44:49 +0200 Subject: [PATCH 057/105] omniorb: bump to version 4.2.0 Also add a hash file. The release announcement (http://www.omniorb-support.com/pipermail/omniorb-list/2014-April/031550.html) mentions support for python3, but I could not make it work. Stay with python2 for now. Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/omniorb/omniorb.hash | 3 +++ package/omniorb/omniorb.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 package/omniorb/omniorb.hash diff --git a/package/omniorb/omniorb.hash b/package/omniorb/omniorb.hash new file mode 100644 index 000000000..d087d958e --- /dev/null +++ b/package/omniorb/omniorb.hash @@ -0,0 +1,3 @@ +# From http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.0/ +sha1 cc52c636f4f329e0481d6bb97b1f0a4bfb21fb3d omniORB-4.2.0.tar.bz2 +md5 f1e104d0a2df92829c1b37a853f4805d omniORB-4.2.0.tar.bz2 diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk index f336c4be9..0df125eed 100644 --- a/package/omniorb/omniorb.mk +++ b/package/omniorb/omniorb.mk @@ -4,7 +4,7 @@ # ################################################################################ -OMNIORB_VERSION = 4.1.6 +OMNIORB_VERSION = 4.2.0 OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION) OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2 OMNIORB_INSTALL_STAGING = YES From 6199f0f8239dc69aaec0111d4d9e8f9bfc1272cb Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 20 Nov 2014 20:35:27 +0100 Subject: [PATCH 058/105] support/scripts/scancpan: generate hash file retrieve MD5 and SHA256 from metacpan.org, and store them in the hash file for each package. [Thomas: remove the odd indentation of the filename for the md5 hash lines in the hash file.] Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- support/scripts/scancpan | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/support/scripts/scancpan b/support/scripts/scancpan index a049e2c7d..7ff647dce 100755 --- a/support/scripts/scancpan +++ b/support/scripts/scancpan @@ -481,6 +481,7 @@ use Pod::Usage; use File::Basename; use Module::CoreList; use HTTP::Tiny; +use Safe; use MetaCPAN::API::Tiny; my ($help, $man, $quiet, $force, $recommend, $test, $host); @@ -505,9 +506,22 @@ my %need_dlopen; # name -> 1 if requires dynamic library my %deps_build; # name -> list of host dependencies my %deps_runtime; # name -> list of target dependencies my %license_files; # name -> list of license files +my %checksum; # author -> list of checksum my $mcpan = MetaCPAN::API::Tiny->new(); my $ua = HTTP::Tiny->new(); +sub get_checksum { + my ($url) = @_; + my($path) = $url =~ m|^[^:/?#]+://[^/?#]*([^?#]*)|; + my($basename, $dirname) = fileparse( $path ); + unless ($checksum{$dirname}) { + my $response = $ua->get(qq{http://cpan.metacpan.org${dirname}CHECKSUMS}); + $checksum{$dirname} = $response->{content}; + } + my $chksum = Safe->new->reval($checksum{$dirname}); + return $chksum->{$basename}, $basename; +} + sub get_manifest { my ($author, $distname, $version) = @_; my $url = qq{http://api.metacpan.org/source/${author}/${distname}-${version}/MANIFEST}; @@ -608,6 +622,7 @@ while (my ($distname, $dist) = each %dist) { my $dirname = q{package/} . $fsname; my $cfgname = $dirname . q{/Config.in}; my $mkname = $dirname . q{/} . $fsname . q{.mk}; + my $hashname = $dirname . q{/} . $fsname . q{.hash}; my $brname = brname( $fsname ); mkdir $dirname unless -d $dirname; if ($need_target{$distname} && ($force || !-f $cfgname)) { @@ -675,6 +690,17 @@ while (my ($distname, $dist) = each %dist) { say {$fh} qq{\$(eval \$(host-perl-package))} if $need_host{$distname}; close $fh; } + if ($force || !-f $hashname) { + my($checksum, $filename) = get_checksum($dist->{download_url}); + my $md5 = $checksum->{md5}; + my $sha256 = $checksum->{sha256}; + say qq{write ${hashname}} unless $quiet; + open my $fh, q{>}, $hashname; + say {$fh} qq{# retrieved by scancpan from http://cpan.metacpan.org/}; + say {$fh} qq{md5 ${md5} ${filename}}; + say {$fh} qq{sha256 ${sha256} ${filename}}; + close $fh; + } } my %pkg; From 0772e28dbb78b71fea444166f131b74dae22abdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20Mart=C3=ADnez?= Date: Fri, 21 Nov 2014 13:19:04 -0300 Subject: [PATCH 059/105] package: matchbox-keyboard: use install instead of cp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in order to not depend on the previous permissions of the file Signed-off-by: Guido Martínez Signed-off-by: Thomas Petazzoni --- package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk index ebf23e4fd..bdcc32f7f 100644 --- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk @@ -15,7 +15,7 @@ MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expa MATCHBOX_KEYBOARD_CONF_ENV = expat=yes define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES - cp -dpf ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/ + $(INSTALL) -D -m 0755 package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/mb-applet-kbd-wrapper.sh endef MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES From 7661580ff2c4e63e3420490b612ab5d7b9486a0a Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Wed, 19 Nov 2014 14:43:56 +0100 Subject: [PATCH 060/105] tvheadend: indentation cleanup Signed-off-by: Bernd Kuhls Signed-off-by: Jerzy Grzegorek Signed-off-by: Thomas Petazzoni --- package/tvheadend/tvheadend.mk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index b0038c836..10c9201d5 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -35,18 +35,18 @@ endif TVHEADEND_DEPENDENCIES += dtv-scan-tables define TVHEADEND_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --prefix=/usr \ - --arch="$(ARCH)" \ - --cpu="$(BR2_GCC_TARGET_CPU)" \ - --python="$(HOST_DIR)/usr/bin/python" \ - --disable-dvbscan \ - --enable-bundle \ - --disable-libffmpeg_static \ - $(TVHEADEND_CONF_OPTS) \ + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ + ./configure \ + --prefix=/usr \ + --arch="$(ARCH)" \ + --cpu="$(BR2_GCC_TARGET_CPU)" \ + --python="$(HOST_DIR)/usr/bin/python" \ + --disable-dvbscan \ + --enable-bundle \ + --disable-libffmpeg_static \ + $(TVHEADEND_CONF_OPTS) \ ) endef From a65e2a9a21ac595014f729ac1d65b2d9e1aeee22 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Mon, 10 Nov 2014 00:38:04 +0100 Subject: [PATCH 061/105] grantlee: version bump and allow building with qt5 Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- package/grantlee/Config.in | 14 ++++--- ...rantlee-0.2.0-fix-lphread-link-error.patch | 42 ------------------- package/grantlee/grantlee.mk | 15 +++++-- 3 files changed, 20 insertions(+), 51 deletions(-) delete mode 100644 package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in index ce1342c1e..8f763f7ef 100644 --- a/package/grantlee/Config.in +++ b/package/grantlee/Config.in @@ -1,11 +1,13 @@ config BR2_PACKAGE_GRANTLEE bool "grantlee" - depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT - depends on BR2_PACKAGE_QT - select BR2_PACKAGE_QT_STL - select BR2_PACKAGE_QT_SCRIPT - select BR2_PACKAGE_QT_GUI_MODULE + depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT && BR2_PACKAGE_QT) || BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT + select BR2_PACKAGE_QT_SCRIPT if BR2_PACKAGE_QT + select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT + select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 help - Qt implemantation of the Django template framework + Qt implementation of the Django template framework http://www.grantlee.org + diff --git a/package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch b/package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch deleted file mode 100644 index 7964fd0d1..000000000 --- a/package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d46475b6bb9d99a4c5c95489be6c14d0d219d5f8 Mon Sep 17 00:00:00 2001 -From: Zoltan Gyarmati -Date: Thu, 15 Nov 2012 17:00:39 +0100 -Subject: [PATCH] fix -lpthread build error - -Fixing linking time error with certain toolchains. The issue caused by a missing explicit linking to -libpthread. The failed buildlog: -Linking CXX executable testgenerictypes_exec -/home/buildroot12git/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libQtCore.so: undefined reference to symbol 'pthread_cancel' -/home/buildroot12git/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: note: 'pthread_cancel' is defined in DSO /home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/lib/libpthread.so.0 so try adding it to the linker command line -/home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/lib/libpthread.so.0: could not read symbols: Invalid operation -collect2: ld returned 1 exit status -make[3]: *** [templates/tests/testgenerictypes_exec] Error 1 -make[3]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0' -make[2]: *** [templates/tests/CMakeFiles/testgenerictypes_exec.dir/all] Error 2 -make[2]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0' -make[1]: *** [all] Error 2 -make[1]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0' -make: *** [/home/buildroot12git/output/build/grantlee-0.2.0/.stamp_built] Error - -Signed-off-by: Zoltan Gyarmati ---- - templates/tests/CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/templates/tests/CMakeLists.txt b/templates/tests/CMakeLists.txt -index caab003..f400622 100644 ---- a/templates/tests/CMakeLists.txt -+++ b/templates/tests/CMakeLists.txt -@@ -68,7 +68,8 @@ macro(GRANTLEE_TEMPLATES_UNIT_TESTS) - ${_testresource_rcc_src} - ) - add_test(${_testname} ${_testname}_exec ) -- target_link_libraries(${_testname}_exec ${QT_QTTEST_LIBRARY} grantlee_core ) -+ find_package (Threads) -+ target_link_libraries(${_testname}_exec ${QT_QTTEST_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} grantlee_core ) - - set_property(GLOBAL APPEND PROPERTY TEST_COVERAGE "${CMAKE_CURRENT_BINARY_DIR}/${_testname}_exec" ) - endforeach(_testname) --- -1.7.9.5 - diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk index 539578b86..a30010636 100644 --- a/package/grantlee/grantlee.mk +++ b/package/grantlee/grantlee.mk @@ -3,12 +3,21 @@ # grantlee # ################################################################################ - -GRANTLEE_VERSION = 0.2.0 +# qt4 support dropped after 0.5.1, so we use the older version for qt4 +ifeq ($(BR2_PACKAGE_QT),y) +GRANTLEE_VERSION = 0.5.1 +else ifeq ($(BR2_PACKAGE_QT5),y) +GRANTLEE_VERSION = 5.0.0 +endif GRANTLEE_SITE = http://downloads.grantlee.org GRANTLEE_INSTALL_STAGING = YES -GRANTLEE_DEPENDENCIES = qt GRANTLEE_LICENSE = LGPLv2.1+ GRANTLEE_LICENSE_FILES = COPYING.LIB +ifeq ($(BR2_PACKAGE_QT),y) +GRANTLEE_DEPENDENCIES = qt +else ifeq ($(BR2_PACKAGE_QT5),y) +GRANTLEE_DEPENDENCIES += qt5base qt5script +endif + $(eval $(cmake-package)) From 3a82b1ec3db7b91c62c3ce13472f2a89dcb815d3 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Wed, 12 Nov 2014 01:25:47 +0100 Subject: [PATCH 062/105] pkg-autotools: move common macros Currently, the common macros used for the various hooks are defined for each and every autotools packages, even though the macros are completely generic. Besides being completely useless, it tends to slow down make, as the variables are redefined over and over again. Move their definitions out of inner-autotools-package. Note: we remove the double-$ because we no longer are in a define-in-a-define block, just a define block. [Thomas: change back the author to Johan. Yann mistakenly changed it when submitting the patch series.] Signed-off-by: Johan Oudinet [yann.morin.1998@free.fr: split the patch into semantically separate patches] Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- package/pkg-autotools.mk | 116 +++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 09f9412c5..60f6997ea 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -46,6 +46,64 @@ endef # $(call AUTOCONF_AC_CHECK_FILE_VAL,/dev/random)=yes AUTOCONF_AC_CHECK_FILE_VAL = ac_cv_file_$(subst -,_,$(subst /,_,$(subst .,_,$(1)))) +# +# Hook to update config.sub and config.guess if needed +# +define UPDATE_CONFIG_HOOK + @$(call MESSAGE,"Updating config.sub and config.guess") + $(call CONFIG_UPDATE,$(@D)) +endef + +# +# Hook to patch libtool to make it work properly for cross-compilation +# +define LIBTOOL_PATCH_HOOK + @$(call MESSAGE,"Patching libtool") + if test "$($(PKG)_LIBTOOL_PATCH)" = "YES" \ + -a "$($(PKG)_AUTORECONF)" != "YES"; then \ + for i in `find $($(PKG)_SRCDIR) -name ltmain.sh`; do \ + ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$i | \ + sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ + if test $${ltmain_version} = '1.5'; then \ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ + elif test $${ltmain_version} = "2.2"; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ + elif test $${ltmain_version} = "2.4"; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ + fi \ + done \ + fi +endef + +# +# Hook to gettextize the package if needed +# +define GETTEXTIZE_HOOK + @$(call MESSAGE,"Gettextizing") + $(Q)cd $($(PKG)_SRCDIR) && $(GETTEXTIZE) $($(PKG)_GETTEXTIZE_OPTS) +endef + +# +# Hook to autoreconf the package if needed +# +define AUTORECONF_HOOK + @$(call MESSAGE,"Autoreconfiguring") + $(Q)cd $($(PKG)_SRCDIR) && $($(PKG)_AUTORECONF_ENV) $(AUTORECONF) $($(PKG)_AUTORECONF_OPTS) + $(Q)if test "$($(PKG)_LIBTOOL_PATCH)" = "YES"; then \ + for i in `find $($(PKG)_SRCDIR) -name ltmain.sh`; do \ + ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$i | \ + sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ + if test $${ltmain_version} = "1.5"; then \ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ + elif test $${ltmain_version} = "2.2"; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ + elif test $${ltmain_version} = "2.4"; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ + fi \ + done \ + fi +endef + ################################################################################ # inner-autotools-package -- defines how the configuration, compilation and # installation of an autotools package should be done, implements a @@ -183,71 +241,13 @@ endef endif endif -# -# Hook to update config.sub and config.guess if needed -# -define UPDATE_CONFIG_HOOK - @$$(call MESSAGE,"Updating config.sub and config.guess") - $$(call CONFIG_UPDATE,$$(@D)) -endef - $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK -# -# Hook to patch libtool to make it work properly for cross-compilation -# -define LIBTOOL_PATCH_HOOK - @$$(call MESSAGE,"Patching libtool") - $$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" \ - -a "$$($$(PKG)_AUTORECONF)" != "YES"; then \ - for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ - ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \ - sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ - if test $$$${ltmain_version} = '1.5'; then \ - $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ - elif test $$$${ltmain_version} = "2.2"; then\ - $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ - elif test $$$${ltmain_version} = "2.4"; then\ - $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ - fi \ - done \ - fi -endef - # default values are not evaluated yet, so don't rely on this defaulting to YES ifneq ($$($(2)_LIBTOOL_PATCH),NO) $(2)_POST_PATCH_HOOKS += LIBTOOL_PATCH_HOOK endif -# -# Hook to gettextize the package if needed -# -define GETTEXTIZE_HOOK - @$$(call MESSAGE,"Gettextizing") - $(Q)cd $$($$(PKG)_SRCDIR) && $$(GETTEXTIZE) $$($$(PKG)_GETTEXTIZE_OPTS) -endef - -# -# Hook to autoreconf the package if needed -# -define AUTORECONF_HOOK - @$$(call MESSAGE,"Autoreconfiguring") - $$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPTS) - $$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \ - for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ - ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \ - sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ - if test $$$${ltmain_version} = "1.5"; then \ - $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ - elif test $$$${ltmain_version} = "2.2"; then\ - $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ - elif test $$$${ltmain_version} = "2.4"; then\ - $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ - fi \ - done \ - fi -endef - # This must be repeated from inner-generic-package, otherwise we get an empty # _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF # and _GETTEXTIZE away from the non-host rule From 59c647e37ddff902259f4165140928011114994f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 12 Nov 2014 01:25:48 +0100 Subject: [PATCH 063/105] pkg-autotools: re-order cleaning up the host dependencies Move the host dependencies cleanup out from in-between all the hooks, so it is easier to see how the hooks all work together. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/pkg-autotools.mk | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 60f6997ea..6e198edf2 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -169,6 +169,14 @@ $(2)_INSTALL_OPTS ?= install $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install +# This must be repeated from inner-generic-package, otherwise we get an empty +# _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF +# and _GETTEXTIZE away from the non-host rule +ifeq ($(4),host) +$(2)_DEPENDENCIES ?= $$(filter-out host-automake host-autoconf host-libtool \ + host-gettext host-toolchain $(1),\ + $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) +endif # # Configure step. Only define it if not already defined by the package @@ -248,15 +256,6 @@ ifneq ($$($(2)_LIBTOOL_PATCH),NO) $(2)_POST_PATCH_HOOKS += LIBTOOL_PATCH_HOOK endif -# This must be repeated from inner-generic-package, otherwise we get an empty -# _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF -# and _GETTEXTIZE away from the non-host rule -ifeq ($(4),host) -$(2)_DEPENDENCIES ?= $$(filter-out host-automake host-autoconf host-libtool \ - host-gettext host-toolchain $(1),\ - $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) -endif - ifeq ($$($(2)_AUTORECONF),YES) # This has to come before autoreconf ifeq ($$($(2)_GETTEXTIZE),YES) From f2d0052f3b665d60302c95a9e0eb98741f17b3f2 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Wed, 12 Nov 2014 01:25:49 +0100 Subject: [PATCH 064/105] pkg-autotools: commonalise the libtool patching code Currently, the heuristic to patch libtool scripts is duplicated both in the libtool post-patch hook and the autoreconf pre-configure hook. Move that code into a single function that gets called from both hooks. [Thomas: change back the author to Johan. Yann mistakenly changed it when submitting the patch series.] Signed-off-by: Johan Oudinet [yann.morin.1998@free.fr: split the patch into semantically separate patches] Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- package/pkg-autotools.mk | 53 +++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 6e198edf2..393f99564 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -36,6 +36,29 @@ define CONFIG_UPDATE done endef +# +# Utility function to patch the libtool files +# +# argument 1 : directory into which to search for libtool scripts to patch. +# Note that libtool scripts are searched for recursively in this directory +# +define PATCH_LIBTOOL + @$(call MESSAGE,"Patching libtool") + $(Q)if test "$($(PKG)_LIBTOOL_PATCH)" = "YES" ]; then \ + for i in `find $(1) -name ltmain.sh`; do \ + ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$i | \ + sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ + if test $${ltmain_version} = '1.5'; then \ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ + elif test $${ltmain_version} = "2.2"; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ + elif test $${ltmain_version} = "2.4"; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ + fi \ + done \ + fi +endef + # This function generates the ac_cv_file_ value for a given # filename. This is needed to convince configure script doing # AC_CHECK_FILE() tests that the file actually exists, since such @@ -58,21 +81,7 @@ endef # Hook to patch libtool to make it work properly for cross-compilation # define LIBTOOL_PATCH_HOOK - @$(call MESSAGE,"Patching libtool") - if test "$($(PKG)_LIBTOOL_PATCH)" = "YES" \ - -a "$($(PKG)_AUTORECONF)" != "YES"; then \ - for i in `find $($(PKG)_SRCDIR) -name ltmain.sh`; do \ - ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$i | \ - sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ - if test $${ltmain_version} = '1.5'; then \ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ - elif test $${ltmain_version} = "2.2"; then\ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ - elif test $${ltmain_version} = "2.4"; then\ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ - fi \ - done \ - fi + $(call PATCH_LIBTOOL,$($(PKG)_SRCDIR)) endef # @@ -89,19 +98,7 @@ endef define AUTORECONF_HOOK @$(call MESSAGE,"Autoreconfiguring") $(Q)cd $($(PKG)_SRCDIR) && $($(PKG)_AUTORECONF_ENV) $(AUTORECONF) $($(PKG)_AUTORECONF_OPTS) - $(Q)if test "$($(PKG)_LIBTOOL_PATCH)" = "YES"; then \ - for i in `find $($(PKG)_SRCDIR) -name ltmain.sh`; do \ - ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$i | \ - sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ - if test $${ltmain_version} = "1.5"; then \ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ - elif test $${ltmain_version} = "2.2"; then\ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ - elif test $${ltmain_version} = "2.4"; then\ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ - fi \ - done \ - fi + $(call PATCH_LIBTOOL,$($(PKG)_SRCDIR)) endef ################################################################################ From d2ae901036897bd9b4a0c3b2835a70667c076bf5 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Wed, 12 Nov 2014 01:25:50 +0100 Subject: [PATCH 065/105] pkg-autotools: move the libtool patching call out of the autoreconf hook Call it as a standalone hook, like is done for post-patch. [Thomas: change back the author to Johan. Yann mistakenly changed it when submitting the patch series.] Signed-off-by: Johan Oudinet [yann.morin.1998@free.fr: split the patch into semantically separate patches] Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- package/pkg-autotools.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 393f99564..45947b008 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -98,7 +98,6 @@ endef define AUTORECONF_HOOK @$(call MESSAGE,"Autoreconfiguring") $(Q)cd $($(PKG)_SRCDIR) && $($(PKG)_AUTORECONF_ENV) $(AUTORECONF) $($(PKG)_AUTORECONF_OPTS) - $(call PATCH_LIBTOOL,$($(PKG)_SRCDIR)) endef ################################################################################ @@ -260,6 +259,10 @@ $(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK $(2)_DEPENDENCIES += host-gettext endif $(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK +# default values are not evaluated yet, so don't rely on this defaulting to YES +ifneq ($$($(2)_LIBTOOL_PATCH),NO) +$(2)_PRE_CONFIGURE_HOOKS += LIBTOOL_PATCH_HOOK +endif $(2)_DEPENDENCIES += host-automake host-autoconf host-libtool endif From 2fceab73f111a9466a7fd30df5d4162e02788504 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 12 Nov 2014 01:25:51 +0100 Subject: [PATCH 066/105] pkg-autotools: remove redundant shell conditional The libtool patching function checks whether patching libtool is wanted before doing the actual patching. This is redundant now, as all callers are now protected by a conditional block. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/pkg-autotools.mk | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 45947b008..e240b95c1 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -44,19 +44,17 @@ endef # define PATCH_LIBTOOL @$(call MESSAGE,"Patching libtool") - $(Q)if test "$($(PKG)_LIBTOOL_PATCH)" = "YES" ]; then \ - for i in `find $(1) -name ltmain.sh`; do \ - ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$i | \ - sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ - if test $${ltmain_version} = '1.5'; then \ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ - elif test $${ltmain_version} = "2.2"; then\ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ - elif test $${ltmain_version} = "2.4"; then\ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ - fi \ - done \ - fi + $(Q)for i in `find $(1) -name ltmain.sh`; do \ + ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$i | \ + sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ + if test $${ltmain_version} = '1.5'; then \ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ + elif test $${ltmain_version} = "2.2"; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ + elif test $${ltmain_version} = "2.4"; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ + fi \ + done endef # This function generates the ac_cv_file_ value for a given From b3b2222fa71d7ae45066257983b643542c70b636 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 12 Nov 2014 01:25:52 +0100 Subject: [PATCH 067/105] pkg-autotools: fold the libtool patching code directly into the hook We now have only one caller of the libtool patching code, which is the hook itself. So, there is no longer any need to extract this code into a utility function, and it can be folded into the hook itself. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/pkg-autotools.mk | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index e240b95c1..924816b9c 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -36,27 +36,6 @@ define CONFIG_UPDATE done endef -# -# Utility function to patch the libtool files -# -# argument 1 : directory into which to search for libtool scripts to patch. -# Note that libtool scripts are searched for recursively in this directory -# -define PATCH_LIBTOOL - @$(call MESSAGE,"Patching libtool") - $(Q)for i in `find $(1) -name ltmain.sh`; do \ - ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$i | \ - sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ - if test $${ltmain_version} = '1.5'; then \ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ - elif test $${ltmain_version} = "2.2"; then\ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ - elif test $${ltmain_version} = "2.4"; then\ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ - fi \ - done -endef - # This function generates the ac_cv_file_ value for a given # filename. This is needed to convince configure script doing # AC_CHECK_FILE() tests that the file actually exists, since such @@ -79,7 +58,18 @@ endef # Hook to patch libtool to make it work properly for cross-compilation # define LIBTOOL_PATCH_HOOK - $(call PATCH_LIBTOOL,$($(PKG)_SRCDIR)) + @$(call MESSAGE,"Patching libtool") + $(Q)for i in `find $($(PKG)_SRCDIR) -name ltmain.sh`; do \ + ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$i | \ + sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ + if test $${ltmain_version} = '1.5'; then \ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ + elif test $${ltmain_version} = "2.2"; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ + elif test $${ltmain_version} = "2.4"; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ + fi \ + done endef # From 452c8da326a29bfbeacce7a360aa0fba3abc3108 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 12 Nov 2014 01:25:53 +0100 Subject: [PATCH 068/105] pkg-autotools: only apply libtool patch at the right moment Currently, we apply the libtool patch at post-patch time, always. If we need to autoreconf, we also apply it after autoreconf is done. Obviously, in that second case, we do not need to apply it at post-patch time. This has no impact on the result, as autoreconf will overwrite the just patched files, and they will be patched yet again. But it is not nice to the user that will see a double "Patching libtool" message. So, we apply the libtool patch at post-patch time only if we are not autoreconfiguring the package. [Thomas: fix minor typo s/casse/case/ in the commit log.] Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/pkg-autotools.mk | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 924816b9c..ad2d1a6f6 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -235,12 +235,8 @@ endif $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK -# default values are not evaluated yet, so don't rely on this defaulting to YES -ifneq ($$($(2)_LIBTOOL_PATCH),NO) -$(2)_POST_PATCH_HOOKS += LIBTOOL_PATCH_HOOK -endif - ifeq ($$($(2)_AUTORECONF),YES) + # This has to come before autoreconf ifeq ($$($(2)_GETTEXTIZE),YES) $(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK @@ -252,6 +248,14 @@ ifneq ($$($(2)_LIBTOOL_PATCH),NO) $(2)_PRE_CONFIGURE_HOOKS += LIBTOOL_PATCH_HOOK endif $(2)_DEPENDENCIES += host-automake host-autoconf host-libtool + +else # ! AUTORECONF = YES + +# default values are not evaluated yet, so don't rely on this defaulting to YES +ifneq ($$($(2)_LIBTOOL_PATCH),NO) +$(2)_POST_PATCH_HOOKS += LIBTOOL_PATCH_HOOK +endif + endif # From f898daf3a17cf8d7860c23e928d55ac5957ea609 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Sat, 22 Nov 2014 23:06:42 +0100 Subject: [PATCH 069/105] python-certifi: add new package Signed-off-by: Yegor Yefremov Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-certifi/Config.in | 6 ++++++ package/python-certifi/python-certifi.hash | 2 ++ package/python-certifi/python-certifi.mk | 14 ++++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 package/python-certifi/Config.in create mode 100644 package/python-certifi/python-certifi.hash create mode 100644 package/python-certifi/python-certifi.mk diff --git a/package/Config.in b/package/Config.in index 9188041e0..a8128ff87 100644 --- a/package/Config.in +++ b/package/Config.in @@ -483,6 +483,7 @@ endif if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 menu "external python modules" source "package/python-bottle/Config.in" + source "package/python-certifi/Config.in" source "package/python-cffi/Config.in" source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" diff --git a/package/python-certifi/Config.in b/package/python-certifi/Config.in new file mode 100644 index 000000000..9390b4f89 --- /dev/null +++ b/package/python-certifi/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_CERTIFI + bool "python-certifi" + help + Python package for providing Mozilla's CA Bundle. + + https://pypi.python.org/pypi/certifi diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash new file mode 100644 index 000000000..9277f51a1 --- /dev/null +++ b/package/python-certifi/python-certifi.hash @@ -0,0 +1,2 @@ +sha1 f53dc8f57aaf6d69c183ebadcec52ece0a55cc3f certifi-14.05.14.tar.gz +sha256 1e1bcbacd6357c151ae37cf0290dcc809721d32ce21fd6b7339568f3ddef1b69 certifi-14.05.14.tar.gz diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk new file mode 100644 index 000000000..f14204169 --- /dev/null +++ b/package/python-certifi/python-certifi.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-certifi +# +################################################################################ + +PYTHON_CERTIFI_VERSION = 14.05.14 +PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz +PYTHON_CERTIFI_SITE = https://pypi.python.org/packages/source/c/certifi +PYTHON_CERTIFI_SETUP_TYPE = setuptools +PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) +PYTHON_CERTIFI_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From d29eb641d3e50e734496ddb2db4aed4e7d63cfbd Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Tue, 18 Nov 2014 15:54:43 +0100 Subject: [PATCH 070/105] package/squid: define the log directory, pidfile and swapdir Signed-off-by: Guillaume GARDET Signed-off-by: Thomas Petazzoni --- package/squid/squid.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/squid/squid.mk b/package/squid/squid.mk index e8a2ccc1a..ed51881d2 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -26,7 +26,10 @@ SQUID_CONF_OPTS = --enable-async-io=8 --enable-linux-netfilter \ --enable-auth-negotiate="wrapper" \ --enable-auth-ntlm="fake" \ --disable-strict-error-checking \ - --enable-external-acl-helpers="file_userip" + --enable-external-acl-helpers="file_userip" \ + --with-logdir=/var/log/squid/ \ + --with-pidfile=/var/run/squid.pid \ + --with-swapdir=/var/cache/squid/ # On uClibc librt needs libpthread ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy) From 70f8b1d5d81e9fa68a62891f1daf4e1c3561b1eb Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Tue, 18 Nov 2014 15:54:45 +0100 Subject: [PATCH 071/105] package/squid: enable ICAP client support in squid Signed-off-by: Guillaume GARDET Signed-off-by: Thomas Petazzoni --- package/squid/squid.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/squid/squid.mk b/package/squid/squid.mk index ed51881d2..306b2a361 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -29,7 +29,8 @@ SQUID_CONF_OPTS = --enable-async-io=8 --enable-linux-netfilter \ --enable-external-acl-helpers="file_userip" \ --with-logdir=/var/log/squid/ \ --with-pidfile=/var/run/squid.pid \ - --with-swapdir=/var/cache/squid/ + --with-swapdir=/var/cache/squid/ \ + --enable-icap-client # On uClibc librt needs libpthread ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy) From fd71748f0db307dbff669efdb816ab5ee0311432 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 25 Nov 2014 08:22:20 -0300 Subject: [PATCH 072/105] grep: bump to version 2.21 Also add hash file. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/grep/grep.hash | 2 ++ package/grep/grep.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 package/grep/grep.hash diff --git a/package/grep/grep.hash b/package/grep/grep.hash new file mode 100644 index 000000000..d27a26a37 --- /dev/null +++ b/package/grep/grep.hash @@ -0,0 +1,2 @@ +# Locally calculated after checking signature +sha256 5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104abee20d3c778e4bb0e5de grep-2.21.tar.xz diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 2c2477c88..80f6e71ef 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -4,7 +4,7 @@ # ################################################################################ -GREP_VERSION = 2.20 +GREP_VERSION = 2.21 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPLv3+ From d8ce24077b68b1fa5422154ae18ed0541be5352e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 25 Nov 2014 19:11:43 +0100 Subject: [PATCH 073/105] package: add python-httplib2 [Thomas: fix the license, it is MIT, not BSD-3c.] Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-httplib2/Config.in | 11 +++++++++++ package/python-httplib2/python-httplib2.hash | 3 +++ package/python-httplib2/python-httplib2.mk | 14 ++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-httplib2/Config.in create mode 100644 package/python-httplib2/python-httplib2.hash create mode 100644 package/python-httplib2/python-httplib2.mk diff --git a/package/Config.in b/package/Config.in index a8128ff87..6875d8b38 100644 --- a/package/Config.in +++ b/package/Config.in @@ -493,6 +493,7 @@ menu "external python modules" source "package/python-dpkt/Config.in" source "package/python-flask/Config.in" source "package/python-flup/Config.in" + source "package/python-httplib2/Config.in" source "package/python-id3/Config.in" source "package/python-ipy/Config.in" source "package/python-ipython/Config.in" diff --git a/package/python-httplib2/Config.in b/package/python-httplib2/Config.in new file mode 100644 index 000000000..e42f5132b --- /dev/null +++ b/package/python-httplib2/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_HTTPLIB2 + bool "python-httplib2" + select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 + help + httplib2 is a comprehensive HTTP client library, httplib2.py + supports many features left out of other HTTP libraries. + + https://pypi.python.org/pypi/httplib2 diff --git a/package/python-httplib2/python-httplib2.hash b/package/python-httplib2/python-httplib2.hash new file mode 100644 index 000000000..6b128d347 --- /dev/null +++ b/package/python-httplib2/python-httplib2.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=09d8e8016911fc40e2e4c58f1aa3ec24, sha256 locally computed +md5 09d8e8016911fc40e2e4c58f1aa3ec24 httplib2-0.9.tar.gz +sha256 39ea8c6a6d9f595c177a16134fc49a990ad8d382758cbf469c8659662f2f51ab httplib2-0.9.tar.gz diff --git a/package/python-httplib2/python-httplib2.mk b/package/python-httplib2/python-httplib2.mk new file mode 100644 index 000000000..ec5c4763e --- /dev/null +++ b/package/python-httplib2/python-httplib2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-httplib2 +# +################################################################################ + +PYTHON_HTTPLIB2_VERSION = 0.9 +PYTHON_HTTPLIB2_SOURCE = httplib2-$(PYTHON_HTTPLIB2_VERSION).tar.gz +PYTHON_HTTPLIB2_SITE = http://pypi.python.org/packages/source/h/httplib2 +PYTHON_HTTPLIB2_SETUP_TYPE = setuptools +PYTHON_HTTPLIB2_LICENSE = MIT +PYTHON_HTTPLIB2_LICENSE_FILES = PKG-INFO + +$(eval $(python-package)) From cfb3af459c60c7dfb6a881ef6a79771565ac0d32 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 25 Nov 2014 19:11:59 -0300 Subject: [PATCH 074/105] liboping: bump to version 1.8.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/liboping/Config.in | 2 +- package/liboping/liboping.hash | 4 ++-- package/liboping/liboping.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/liboping/Config.in b/package/liboping/Config.in index ffdebbd98..65e7c8856 100644 --- a/package/liboping/Config.in +++ b/package/liboping/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBOPING liboping is a C library to generate ICMP echo requests, better known as "ping packets". - http://verplant.org/liboping/ + http://noping.cc/ comment "liboping needs a toolchain w/ IPv6" depends on !BR2_INET_IPV6 diff --git a/package/liboping/liboping.hash b/package/liboping/liboping.hash index 5987d7a1d..536f6aef5 100644 --- a/package/liboping/liboping.hash +++ b/package/liboping/liboping.hash @@ -1,2 +1,2 @@ -# From http://verplant.org/liboping/#download -sha256 25cf9417fe84d70c4b1bd97f1f92e597ccdc1ec2da3b7eb311f33f5e7033a70e liboping-1.7.0.tar.gz +# From http://noping.cc/#download +sha256 824792ae7fc5e9569bacc4167b89de31f6ba8476de44760f0bc272682e894b41 liboping-1.8.0.tar.gz diff --git a/package/liboping/liboping.mk b/package/liboping/liboping.mk index bb026168f..aeaaa8a90 100644 --- a/package/liboping/liboping.mk +++ b/package/liboping/liboping.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBOPING_VERSION = 1.7.0 -LIBOPING_SITE = http://verplant.org/liboping/files +LIBOPING_VERSION = 1.8.0 +LIBOPING_SITE = http://noping.cc/files LIBOPING_INSTALL_STAGING = YES LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses) LIBOPING_CONF_OPTS = --without-perl-bindings From 067570a39f65fd44782cce887da567b521651ec3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 26 Nov 2014 11:19:01 -0300 Subject: [PATCH 075/105] valgrind: bump to version 3.10.1 Add hash file and switch to a non-dead homepage. Enable for supported architectures: powerpc64 & powerpc64le. Even though aarch64 is supported it's still a bit rought resulting in build failures so don't enable it for now. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/valgrind/Config.in | 9 +++++---- package/valgrind/valgrind.hash | 2 ++ package/valgrind/valgrind.mk | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 package/valgrind/valgrind.hash diff --git a/package/valgrind/Config.in b/package/valgrind/Config.in index b7521b021..558d5f07b 100644 --- a/package/valgrind/Config.in +++ b/package/valgrind/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_VALGRIND bool "valgrind" - depends on BR2_i386 || BR2_x86_64 || BR2_ARM_CPU_ARMV7A || \ - BR2_powerpc || BR2_mips || BR2_mipsel || BR2_mips64 || \ - BR2_mips64el + depends on BR2_ARM_CPU_ARMV7A || BR2_i386 || \ + BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ + BR2_powerpc || BR2_powerpc64 || BR2_powerpc64el || \ + BR2_x86_64 help Tool for debugging and profiling Linux programs. - http://valgrind.kde.org/ + http://valgrind.org/ if BR2_PACKAGE_VALGRIND diff --git a/package/valgrind/valgrind.hash b/package/valgrind/valgrind.hash new file mode 100644 index 000000000..f311ea48c --- /dev/null +++ b/package/valgrind/valgrind.hash @@ -0,0 +1,2 @@ +# From http://valgrind.org/downloads/current.html +md5 60ddae962bc79e7c95cfc4667245707f valgrind-3.10.1.tar.bz2 diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index b65e0488f..aaca39f2a 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALGRIND_VERSION = 3.10.0 +VALGRIND_VERSION = 3.10.1 VALGRIND_SITE = http://valgrind.org/downloads VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPLv2 GFDLv1.2 From 7a6d8bf5d8ed299f4457276ffa994b409cb0d9ca Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 26 Nov 2014 16:16:13 +0100 Subject: [PATCH 076/105] network-manager: S45network-manager: don't use pidof -o option The pidof -o option is only available in the Busybox applet if CONFIG_FEATURE_PIDOF_OMIT is enabled, and it isn't really needed here as the init script isn't called 'NetworkManager', so get rid of it. Signed-off-by: Peter Korsgaard --- package/network-manager/S45network-manager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network-manager/S45network-manager b/package/network-manager/S45network-manager index 78808912b..5f32398e6 100755 --- a/package/network-manager/S45network-manager +++ b/package/network-manager/S45network-manager @@ -8,7 +8,7 @@ NETWORKMANAGER_BIN=${sbindir}/NetworkManager [ -x $NETWORKMANAGER_BIN ] || exit 0 -PID=`pidof -o %PPID NetworkManager` +PID=`pidof NetworkManager` case "$1" in start) echo -n "Starting NetworkManager ... " From 7522023a845f2bb20999c49eb52f1bb4d0aa22ff Mon Sep 17 00:00:00 2001 From: Pedro Aguilar Date: Mon, 24 Nov 2014 23:56:27 +0100 Subject: [PATCH 077/105] libatomic_ops: Add host-libatomic_ops The host-libatomic_ops is needed by host-bdwgc that is needed in turn by guile. Signed-off-by: Pedro Aguilar Signed-off-by: Thomas Petazzoni --- package/libatomic_ops/libatomic_ops.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk index d47390134..6a26775e7 100644 --- a/package/libatomic_ops/libatomic_ops.mk +++ b/package/libatomic_ops/libatomic_ops.mk @@ -20,3 +20,4 @@ LIBATOMIC_OPS_LICENSE_FILES = doc/LICENSING.txt COPYING LIBATOMIC_OPS_INSTALL_STAGING = YES $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From b0476427f6c0036b7803d591a5394923c4b07142 Mon Sep 17 00:00:00 2001 From: Pedro Aguilar Date: Mon, 24 Nov 2014 23:56:28 +0100 Subject: [PATCH 078/105] bdwgc: Add new package bdwgc is a garbage collector for C and C++. The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage collecting replacement for C 'malloc' or C++ 'new'. [Thomas: - drop the dependency on host-bdwgc, since it is not needed. Only host-guile will need host-bdwgc, but bdwgc itself doesn't need host-bdwgc. - add dependency on host-pkgconf, needed to detect libatomic_ops - add --with-libatomic-ops=yes to force bdwgc to use the system libatomic_ops, and not the internal one. - instead of using BDWGC_LIBTOOL_PATCH = NO (needed to avoid patching libtool because the libtool version used by bdwgc does not have a corresponding patch in Buildroot), use BDWGC_AUTORECONF = YES, which generates a proper libtool (without this, some -L/usr/lib flags are added by libtool).] Signed-off-by: Pedro Aguilar Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/bdwgc/Config.in | 10 ++++++++++ package/bdwgc/bdwgc.mk | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 package/bdwgc/Config.in create mode 100644 package/bdwgc/bdwgc.mk diff --git a/package/Config.in b/package/Config.in index 6875d8b38..5d6d62dd9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -859,6 +859,7 @@ menu "Other" source "package/apr-util/Config.in" source "package/argp-standalone/Config.in" source "package/armadillo/Config.in" + source "package/bdwgc/Config.in" source "package/boost/Config.in" source "package/clapack/Config.in" source "package/classpath/Config.in" diff --git a/package/bdwgc/Config.in b/package/bdwgc/Config.in new file mode 100644 index 000000000..9aa7c7dff --- /dev/null +++ b/package/bdwgc/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_BDWGC + bool "bdwgc" + depends on BR2_PACKAGE_LIBATOMIC_ARCH_SUPPORTS + select BR2_PACKAGE_LIBATOMIC_OPS + help + The Boehm-Demers-Weiser conservative garbage collector can + be used as a garbage collecting replacement for C 'malloc' + or C++ 'new'. + + http://www.hboehm.info/gc/ diff --git a/package/bdwgc/bdwgc.mk b/package/bdwgc/bdwgc.mk new file mode 100644 index 000000000..3e6de1ac9 --- /dev/null +++ b/package/bdwgc/bdwgc.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# bdwgc +# +################################################################################ + +BDWGC_VERSION = 7.2f +BDWGC_SOURCE = gc-$(BDWGC_VERSION).tar.gz +BDWGC_SITE = http://www.hboehm.info/gc/gc_source +BDWGC_INSTALL_STAGING = YES +BDWGC_LICENSE = bdwgc license +BDWGC_LICENSE_FILES = README.QUICK +BDWGC_DEPENDENCIES = libatomic_ops host-pkgconf + +# The libtool shipped with the package is bogus and generates some +# -L/usr/lib flags. It uses a version not supported by Buildroot +# libtool patches, so autoreconfiguring the packages is the easiest +# solution. +BDWGC_AUTORECONF = YES + +# Ensure we use the system libatomic_ops, and not the internal one. +BDWGC_CONF_OPTS = --with-libatomic-ops=yes +HOST_BDWGC_CONF_OPTS = --with-libatomic-ops=yes + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) From 319e7ffbe8fa4a1ff7733c40ff87123bbc495f82 Mon Sep 17 00:00:00 2001 From: Pedro Aguilar Date: Mon, 24 Nov 2014 23:56:29 +0100 Subject: [PATCH 079/105] libunistring: host-libunistring is needed by guile Signed-off-by: Pedro Aguilar Signed-off-by: Thomas Petazzoni --- package/libunistring/libunistring.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk index 3234ddcfa..fd77d1242 100644 --- a/package/libunistring/libunistring.mk +++ b/package/libunistring/libunistring.mk @@ -17,3 +17,4 @@ LIBUNISTRING_CONF_OPTS += --disable-threads endif $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From 8df26deab145425251fc3c6a0175a63e3fb10c0d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 25 Nov 2014 22:33:10 +0100 Subject: [PATCH 080/105] libunistring: add wchar dependency Even though libunistring itself builds fine, its library contains undefined references to wchar related functions, which are causing link failures when the library is actually linked into an application. Signed-off-by: Thomas Petazzoni --- package/libunistring/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libunistring/Config.in b/package/libunistring/Config.in index ebb37d979..88fc65803 100644 --- a/package/libunistring/Config.in +++ b/package/libunistring/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_LIBUNISTRING bool "libunistring" + depends on BR2_USE_WCHAR help The libunistring library provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard. http://www.gnu.org/software/libunistring/ + +comment "libunistring needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR From 6322f25e1fe6945cc696b08a39665f15ea3c1900 Mon Sep 17 00:00:00 2001 From: Pedro Aguilar Date: Mon, 24 Nov 2014 23:56:30 +0100 Subject: [PATCH 081/105] guile: Add new package Guile is an interpreter and compiler for the Scheme programming language, a clean and elegant dialect of Lisp. The patch guile-01-fix_arm_endianness.patch is based on guile's git commit ^ffd3e55cfd [Thomas: - rewrap comments and help text. - add missing host-gettext dependency, since gettext.m4 is needed for the package to autoreconf. - add missing host-pkgconf dependency. - add dependency on wchar, inherited from libunistring.] Signed-off-by: Pedro Aguilar Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/guile/Config.in | 18 ++++++++++ .../guile/guile-01-fix_arm_endianness.patch | 25 +++++++++++++ .../guile-02-calculate-csqrt_manually.patch | 16 +++++++++ .../guile/guile-03-remove_unused_funcs.patch | 36 +++++++++++++++++++ package/guile/guile.mk | 33 +++++++++++++++++ 6 files changed, 129 insertions(+) create mode 100644 package/guile/Config.in create mode 100644 package/guile/guile-01-fix_arm_endianness.patch create mode 100644 package/guile/guile-02-calculate-csqrt_manually.patch create mode 100644 package/guile/guile-03-remove_unused_funcs.patch create mode 100644 package/guile/guile.mk diff --git a/package/Config.in b/package/Config.in index 5d6d62dd9..f3b189bb7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -392,6 +392,7 @@ endmenu menu "Interpreter languages and scripting" source "package/enscript/Config.in" source "package/erlang/Config.in" + source "package/guile/Config.in" source "package/haserl/Config.in" source "package/jamvm/Config.in" source "package/jimtcl/Config.in" diff --git a/package/guile/Config.in b/package/guile/Config.in new file mode 100644 index 000000000..009dbdf27 --- /dev/null +++ b/package/guile/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_GUILE + bool "guile" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_LIBATOMIC_ARCH_SUPPORTS # bdwgc + depends on BR2_USE_WCHAR # libunistring + select BR2_PACKAGE_LIBUNISTRING + select BR2_PACKAGE_LIBFFI + select BR2_PACKAGE_GMP + select BR2_PACKAGE_BDWGC + help + Guile is an interpreter and compiler for the Scheme + programming language, a clean and elegant dialect of Lisp. + + http://www.gnu.org/software/guile + +comment "guile needs a toolchain w/ threads, wchar" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + diff --git a/package/guile/guile-01-fix_arm_endianness.patch b/package/guile/guile-01-fix_arm_endianness.patch new file mode 100644 index 000000000..67c0b606e --- /dev/null +++ b/package/guile/guile-01-fix_arm_endianness.patch @@ -0,0 +1,25 @@ +Fix support for ARM endianness, otherwise it gives the error +"unknown CPU endianness" + +Signed-off-by: Pedro Aguilar + +diff -Nau guile-2.0.11.orig/module/system/base/target.scm guile-2.0.11/module/system/base/target.scm +--- guile-2.0.11.orig/module/system/base/target.scm 2013-02-28 09:42:45.000000000 +0100 ++++ guile-2.0.11/module/system/base/target.scm 2014-11-03 23:05:01.789338997 +0100 +@@ -70,7 +70,15 @@ + ((member cpu '("sparc" "sparc64" "powerpc" "powerpc64" "spu" + "mips" "mips64")) + (endianness big)) +- ((string-match "^arm.*el" cpu) ++ ((string-match "^arm.*el" cpu) ++ (endianness little)) ++ ((string-match "^arm.*eb" cpu) ++ (endianness big)) ++ ((string-prefix? "arm" cpu) ;ARMs are LE by default ++ (endianness little)) ++ ((string-match "^aarch64.*be" cpu) ++ (endianness big)) ++ ((string=? "aarch64" cpu) + (endianness little)) + (else + (error "unknown CPU endianness" cpu))))) diff --git a/package/guile/guile-02-calculate-csqrt_manually.patch b/package/guile/guile-02-calculate-csqrt_manually.patch new file mode 100644 index 000000000..98bb0b685 --- /dev/null +++ b/package/guile/guile-02-calculate-csqrt_manually.patch @@ -0,0 +1,16 @@ +Avoid using scm_from_complex_double(csqrt()) when building with uclibc. + +Signed-off-by: Pedro Aguilar + +diff -Nau guile-2.0.11.orig/configure.ac guile-2.0.11/configure.ac +--- guile-2.0.11.orig/configure.ac 2014-03-12 14:36:02.000000000 +0100 ++++ guile-2.0.11/configure.ac 2014-11-03 23:59:51.897267207 +0100 +@@ -862,7 +862,7 @@ + }]])], + [guile_cv_use_csqrt=yes], + [guile_cv_use_csqrt="no, glibc 2.3 bug"], +- [guile_cv_use_csqrt="yes, hopefully (cross-compiling)"])]) ++ [guile_cv_use_csqrt="no (cross-compiling)"])]) + case $guile_cv_use_csqrt in + yes*) + AC_DEFINE([HAVE_USABLE_CSQRT], 1, [Define to 1 if csqrt is bug-free]) diff --git a/package/guile/guile-03-remove_unused_funcs.patch b/package/guile/guile-03-remove_unused_funcs.patch new file mode 100644 index 000000000..3d70ee9fc --- /dev/null +++ b/package/guile/guile-03-remove_unused_funcs.patch @@ -0,0 +1,36 @@ +Remove unused static inline functions str_upcase_l() and +str_downcase_l() that cause the compilation error: +'dereferencing pointer to incomplete type'. + +Signed-off-by: Pedro Aguilar + +diff -Nau guile-2.0.11.orig/libguile/i18n.c guile-2.0.11/libguile/i18n.c +--- guile-2.0.11.orig/libguile/i18n.c 2014-01-21 22:25:11.000000000 +0100 ++++ guile-2.0.11/libguile/i18n.c 2014-11-04 23:18:52.675435613 +0100 +@@ -851,26 +851,6 @@ + *dst = '\0'; + } + +-#ifdef USE_GNU_LOCALE_API +-static inline void +-str_upcase_l (register char *dst, register const char *src, +- scm_t_locale locale) +-{ +- for (; *src != '\0'; src++, dst++) +- *dst = toupper_l (*src, locale); +- *dst = '\0'; +-} +- +-static inline void +-str_downcase_l (register char *dst, register const char *src, +- scm_t_locale locale) +-{ +- for (; *src != '\0'; src++, dst++) +- *dst = tolower_l (*src, locale); +- *dst = '\0'; +-} +-#endif +- + + SCM_DEFINE (scm_string_locale_lt, "string-locale Date: Wed, 26 Nov 2014 09:16:24 +0100 Subject: [PATCH 082/105] package: add python-networkmanager Signed-off-by: Peter Korsgaard Acked-by: Ryan Barnett Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-networkmanager/Config.in | 15 +++++++++++++++ .../python-networkmanager.hash | 3 +++ .../python-networkmanager.mk | 14 ++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 package/python-networkmanager/Config.in create mode 100644 package/python-networkmanager/python-networkmanager.hash create mode 100644 package/python-networkmanager/python-networkmanager.mk diff --git a/package/Config.in b/package/Config.in index f3b189bb7..bb5b144e8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -508,6 +508,7 @@ menu "external python modules" source "package/python-meld3/Config.in" source "package/python-msgpack/Config.in" source "package/python-netifaces/Config.in" + source "package/python-networkmanager/Config.in" source "package/python-nfc/Config.in" source "package/python-numpy/Config.in" source "package/python-posix-ipc/Config.in" diff --git a/package/python-networkmanager/Config.in b/package/python-networkmanager/Config.in new file mode 100644 index 000000000..fcbce5748 --- /dev/null +++ b/package/python-networkmanager/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_NETWORKMANAGER + bool "python-networkmanager" + depends on BR2_PACKAGE_NETWORK_MANAGER # runtime + depends on BR2_USE_WCHAR # dbus-python + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-python + depends on BR2_PACKAGE_DBUS # dbus-python + select BR2_PACKAGE_DBUS_PYTHON + help + python-networkmanager wraps NetworkManagers D-Bus interface + so you can be less verbose when talking to NetworkManager + from python. All interfaces have been wrapped in classes, + properties are exposed as python properties and function + calls are forwarded to the correct interface. + + https://pypi.python.org/pypi/python-networkmanager/ diff --git a/package/python-networkmanager/python-networkmanager.hash b/package/python-networkmanager/python-networkmanager.hash new file mode 100644 index 000000000..6c6f69722 --- /dev/null +++ b/package/python-networkmanager/python-networkmanager.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=2cd400a7ca4dcd1ea98c864007032494, sha256 locally computed +md5 2cd400a7ca4dcd1ea98c864007032494 python-networkmanager-0.9.12.tar.gz +sha256 a4c7bbae8a1ee3cf370ff0cd2ba2e0f1fb7f8e8f99f8f48a1df624c19a11166f python-networkmanager-0.9.12.tar.gz diff --git a/package/python-networkmanager/python-networkmanager.mk b/package/python-networkmanager/python-networkmanager.mk new file mode 100644 index 000000000..c043edb3f --- /dev/null +++ b/package/python-networkmanager/python-networkmanager.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-networkmanager +# +################################################################################ + +PYTHON_NETWORKMANAGER_VERSION = 0.9.12 +PYTHON_NETWORKMANAGER_SITE = http://pypi.python.org/packages/source/p/python-networkmanager +PYTHON_NETWORKMANAGER_SETUP_TYPE = distutils +PYTHON_NETWORKMANAGER_LICENSE = GPLv3+ +PYTHON_NETWORKMANAGER_LICENSE_FILES = COPYING +PYTHON_NETWORKMANAGER_DEPENDENCIES = dbus-python + +$(eval $(python-package)) From 1144059ede54f9908f3e5cb6b41b395efb6855d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Date: Wed, 26 Nov 2014 01:00:15 +0100 Subject: [PATCH 083/105] samba: Add support for libnss_win*.so* installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The libnss_wins and libnss_winbind libraries are required in order to add support for the wins and winbind sources to the Name Service Switch (NSS), so make it possible to install them. This is useful in order to resolve NetBIOS names or user and group information from a Windows NT server. These libraries are installed to /lib/ like the standard libnss_* libraries from (E)GLIBC. [Thomas: remove useless comments.] Signed-off-by: Benoît Thébaudeau Signed-off-by: Thomas Petazzoni --- package/samba/Config.in | 19 +++++++++++++++++++ package/samba/samba.mk | 16 ++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/package/samba/Config.in b/package/samba/Config.in index 8dd0bf2b4..e2cac9e94 100644 --- a/package/samba/Config.in +++ b/package/samba/Config.in @@ -240,6 +240,25 @@ config BR2_PACKAGE_SAMBA_LIBSMBCLIENT standards POSIX functions available for manipulating local files. +config BR2_PACKAGE_SAMBA_LIBNSS_WINS + bool "libnss_wins" + default y + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_PACKAGE_SAMBA_WINBINDD + help + libnss_wins is a library that permits the Name Service Switch + to resolve NetBIOS names. + +config BR2_PACKAGE_SAMBA_LIBNSS_WINBIND + bool "libnss_winbind" + default y + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_PACKAGE_SAMBA_WINBINDD + help + libnss_winbind is a library that permits the Name Service + Switch to resolve user and group information from a Windows + NT server. + endmenu diff --git a/package/samba/samba.mk b/package/samba/samba.mk index 19579978c..ec8e6ecb7 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -135,6 +135,22 @@ endef SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_REMOVE_UNNEEDED_BINARIES +ifeq ($(BR2_PACKAGE_SAMBA_LIBNSS_WINS),y) +define SAMBA_INSTALL_LIBNSS_WINS + $(INSTALL) -m 0755 -D $(@D)/nsswitch/libnss_wins.so $(TARGET_DIR)/lib/libnss_wins.so + ln -snf libnss_wins.so $(TARGET_DIR)/lib/libnss_wins.so.2 +endef +SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_LIBNSS_WINS +endif + +ifeq ($(BR2_PACKAGE_SAMBA_LIBNSS_WINBIND),y) +define SAMBA_INSTALL_LIBNSS_WINBIND + $(INSTALL) -m 0755 -D $(@D)/nsswitch/libnss_winbind.so $(TARGET_DIR)/lib/libnss_winbind.so + ln -snf libnss_winbind.so $(TARGET_DIR)/lib/libnss_winbind.so.2 +endef +SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_LIBNSS_WINBIND +endif + define SAMBA_REMOVE_SWAT_DOCUMENTATION # Remove the documentation rm -rf $(TARGET_DIR)/usr/swat/help/manpages From 4e987b1cd482b4a6c5c953f71674cfd1e9592279 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 26 Nov 2014 16:01:18 -0300 Subject: [PATCH 084/105] rng-tools: bump to version 5 Add semi-automatic libgcrypt dependency for i386/x86_64 to use RDRAND. This is exclusively used by rngd for which we don't yet ship an initscript/service file. Even so the user can choose to disable it at invocation time via the --no-drng option (which must be accounted for). Also add hash file. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/rng-tools/Config.in | 2 ++ package/rng-tools/rng-tools.hash | 3 +++ package/rng-tools/rng-tools.mk | 18 +++++++++++++----- 3 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 package/rng-tools/rng-tools.hash diff --git a/package/rng-tools/Config.in b/package/rng-tools/Config.in index c50a8c084..43c5a1c2e 100644 --- a/package/rng-tools/Config.in +++ b/package/rng-tools/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_RNG_TOOLS bool "rng-tools" select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC + # For rdrand ligcrypt is required and it's not obvious to users + select BR2_PACKAGE_LIBGCRYPT if BR2_i386 || BR2_x86_64 help Daemon to use hardware random number generators. diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash new file mode 100644 index 000000000..09769e462 --- /dev/null +++ b/package/rng-tools/rng-tools.hash @@ -0,0 +1,3 @@ +# From http://sourceforge.net/projects/gkernel/files/rng-tools/5/ +md5 6726cdc6fae1f5122463f24ae980dd68 rng-tools-5.tar.gz +sha1 3092768ac45315a5dcc0170d05566d1d00dbad96 rng-tools-5.tar.gz diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 56858e7ea..5b89656e0 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -4,13 +4,21 @@ # ################################################################################ -RNG_TOOLS_VERSION = 4 +RNG_TOOLS_VERSION = 5 RNG_TOOLS_SITE = http://downloads.sourceforge.net/project/gkernel/rng-tools/$(RNG_TOOLS_VERSION) -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -RNG_TOOLS_CONF_ENV = LIBS="-largp" -RNG_TOOLS_DEPENDENCIES = argp-standalone -endif RNG_TOOLS_LICENSE = GPLv2 RNG_TOOLS_LICENSE_FILES = COPYING +# Work around for uClibc's lack of argp_*() functions +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) +RNG_TOOLS_CONF_ENV += LIBS="-largp" +RNG_TOOLS_DEPENDENCIES += argp-standalone +endif + +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +RNG_TOOLS_DEPENDENCIES += libgcrypt +else +RNG_TOOLS_CONF_OPTS += --without-libgcrypt +endif + $(eval $(autotools-package)) From 4aa0271d17988847233f2ae7bb90ca66b9146932 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sun, 23 Nov 2014 17:16:11 -0500 Subject: [PATCH 085/105] lttng-babeltrace: Remove dependency on lttng-tools babeltrace is used to read the traces generated by lttng, but it doesn't depend on lttng-tools. Signed-off-by: Simon Marchi Signed-off-by: Thomas Petazzoni --- package/lttng-babeltrace/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in index ce776d187..3fe1b3ac4 100644 --- a/package/lttng-babeltrace/Config.in +++ b/package/lttng-babeltrace/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LTTNG_BABELTRACE bool "lttng-babeltrace" - depends on BR2_PACKAGE_LTTNG_TOOLS select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_LIBGLIB2 @@ -27,7 +26,6 @@ config BR2_PACKAGE_LTTNG_BABELTRACE http://lttng.org comment "lttng-babeltrace needs a uclibc snapshot or (e)glib toolchain w/ wchar, threads, largefile" - depends on BR2_PACKAGE_LTTNG_TOOLS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS \ || !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_USES_GLIBC) From b2d327d0dd3dcc661318790c1e8269c050c4ff54 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 23 Nov 2014 20:56:51 +0100 Subject: [PATCH 086/105] package/liburiparser: New package [Thomas: - put liburiparser at the right place in package/Config.in, i.e sorted alphabetically - use positive logic for the wchar test.] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/liburiparser/Config.in | 7 +++++++ package/liburiparser/liburiparser.hash | 3 +++ package/liburiparser/liburiparser.mk | 19 +++++++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 package/liburiparser/Config.in create mode 100644 package/liburiparser/liburiparser.hash create mode 100644 package/liburiparser/liburiparser.mk diff --git a/package/Config.in b/package/Config.in index bb5b144e8..b8fc7d15a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -837,6 +837,7 @@ menu "Networking" source "package/libtorrent/Config.in" source "package/libupnp/Config.in" source "package/libupnpp/Config.in" + source "package/liburiparser/Config.in" source "package/libvncserver/Config.in" source "package/libwebsockets/Config.in" source "package/neon/Config.in" diff --git a/package/liburiparser/Config.in b/package/liburiparser/Config.in new file mode 100644 index 000000000..95a6fe83a --- /dev/null +++ b/package/liburiparser/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBURIPARSER + bool "liburiparser" + help + uriparser is a strictly RFC 3986 compliant URI parsing and handling + library written in C. + + http://uriparser.sourceforge.net diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash new file mode 100644 index 000000000..84340f8b9 --- /dev/null +++ b/package/liburiparser/liburiparser.hash @@ -0,0 +1,3 @@ +# From http://sourceforge.net/projects/uriparser/files/Sources/0.8.1/ +md5 4e4c5f0ee6abb111a431c45e144247aa uriparser-0.8.1.tar.bz2 +sha1 4405d8baa0d9f5bc0319e6d5e68770acab67b602 uriparser-0.8.1.tar.bz2 diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk new file mode 100644 index 000000000..661fa960f --- /dev/null +++ b/package/liburiparser/liburiparser.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# liburiparser +# +################################################################################ + +LIBURIPARSER_VERSION = 0.8.1 +LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 +LIBURIPARSER_SITE = http://sourceforge.net/projects/uriparser/files/Sources/$(LIBURIPARSER_VERSION) +LIBURIPARSER_LICENSE = BSD-3c +LIBURIPARSER_LICENSE_FILES = COPYING +LIBURIPARSER_INSTALL_STAGING = YES +LIBURIPARSER_CONF_OPTS = --disable-test + +ifeq ($(BR2_USE_WCHAR),) +LIBURIPARSER_CONF_OPTS += --disable-wchar_t +endif + +$(eval $(autotools-package)) From c9e2be0cd80e4318db60312bdf6abab472219048 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 23 Nov 2014 20:56:52 +0100 Subject: [PATCH 087/105] package/tvheadend: Add support for liburiparser Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tvheadend/tvheadend.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 10c9201d5..f593b3f00 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -32,12 +32,18 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) TVHEADEND_DEPENDENCIES += libiconv endif +ifeq ($(BR2_PACKAGE_LIBURIPARSER),y) +TVHEADEND_DEPENDENCIES += liburiparser +TVHEADEND_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)" +endif + TVHEADEND_DEPENDENCIES += dtv-scan-tables define TVHEADEND_CONFIGURE_CMDS (cd $(@D); \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ + $(TVHEADEND_CONF_ENV) \ ./configure \ --prefix=/usr \ --arch="$(ARCH)" \ From 9245aef2b54f381a90c74ccdfad8aaf2ebe8e6a7 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 27 Nov 2014 15:14:06 -0300 Subject: [PATCH 088/105] configs/p1010rdb: bump to kernel 3.17.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- .../p1010rdb/{linux-3.13.config => linux-3.17.config} | 3 --- board/freescale/p1010rdb/readme.txt | 2 +- configs/freescale_p1010rdb_pa_defconfig | 10 +++++----- 3 files changed, 6 insertions(+), 9 deletions(-) rename board/freescale/p1010rdb/{linux-3.13.config => linux-3.17.config} (97%) diff --git a/board/freescale/p1010rdb/linux-3.13.config b/board/freescale/p1010rdb/linux-3.17.config similarity index 97% rename from board/freescale/p1010rdb/linux-3.13.config rename to board/freescale/p1010rdb/linux-3.17.config index b91d31255..c48c4fb5d 100644 --- a/board/freescale/p1010rdb/linux-3.13.config +++ b/board/freescale/p1010rdb/linux-3.17.config @@ -57,11 +57,9 @@ CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_MTD_NAND_FSL_IFC=y -CONFIG_PROC_DEVICETREE=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y CONFIG_BLK_DEV_RAM=y @@ -71,7 +69,6 @@ CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=y CONFIG_BLK_DEV_SR=y CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_LOGGING=y CONFIG_ATA=y CONFIG_SATA_FSL=y diff --git a/board/freescale/p1010rdb/readme.txt b/board/freescale/p1010rdb/readme.txt index b73ef4d53..b119f9a47 100644 --- a/board/freescale/p1010rdb/readme.txt +++ b/board/freescale/p1010rdb/readme.txt @@ -45,7 +45,7 @@ your newly built U-Boot. 2. Program the DTB to NOR flash - => tftp $loadaddr p1010rdb.dtb + => tftp $loadaddr p1010rdb-pa.dtb => erase 0xee000000 +$filesize => cp.b $loadaddr 0xee000000 $filesize diff --git a/configs/freescale_p1010rdb_pa_defconfig b/configs/freescale_p1010rdb_pa_defconfig index d3e053815..b784f393a 100644 --- a/configs/freescale_p1010rdb_pa_defconfig +++ b/configs/freescale_p1010rdb_pa_defconfig @@ -11,18 +11,18 @@ BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x20000 # Lock headers version to match and avoid breakage BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.13.6" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y +BR2_DEFAULT_KERNEL_VERSION="3.17.4" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.4" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.13.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.17.config" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb-pa" # Serial port config BR2_TARGET_GENERIC_GETTY=y From 9739d823db6c23f35377dccfb672493b805cddab Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 27 Nov 2014 13:33:25 -0300 Subject: [PATCH 089/105] flac: bump to version 1.3.1 All patches upstream and add hash file. [Thomas: remove AUTORECONF = YES, since we no longer have any patches touching configure.ac/Makefile.am] Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/flac/flac-01-fix-altivec-logic.patch | 32 -------------------- package/flac/flac.hash | 2 ++ package/flac/flac.mk | 3 +- 3 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 package/flac/flac-01-fix-altivec-logic.patch create mode 100644 package/flac/flac.hash diff --git a/package/flac/flac-01-fix-altivec-logic.patch b/package/flac/flac-01-fix-altivec-logic.patch deleted file mode 100644 index a1ac8a1fd..000000000 --- a/package/flac/flac-01-fix-altivec-logic.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d65ede3e874c79348efc85cf3a185c170046c4c8 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 4 Dec 2013 13:31:28 -0300 -Subject: [PATCH] Fix Makefile.am altivec logic - -Besides SPE (FSL e500v? cores) there are other powerpc processors -that don't support altivec instructions so only enable them when it's -100% sure that the target has it. - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Erik de Castro Lopo ---- - src/libFLAC/Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am -index 247e33c..258de40 100644 ---- a/src/libFLAC/Makefile.am -+++ b/src/libFLAC/Makefile.am -@@ -47,8 +47,7 @@ CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM - else - # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific - CPUCFLAGS = --if FLaC__CPU_PPC_SPE --else -+if FLaC__USE_ALTIVEC - CPUCFLAGS += -maltivec -mabi=altivec - endif - #@@@ PPC optimizations temporarily disabled --- -1.8.3.2 - diff --git a/package/flac/flac.hash b/package/flac/flac.hash new file mode 100644 index 000000000..6a0da1162 --- /dev/null +++ b/package/flac/flac.hash @@ -0,0 +1,2 @@ +# From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt +sha256 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c flac-1.3.1.tar.xz diff --git a/package/flac/flac.mk b/package/flac/flac.mk index daedd4755..b819064c2 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,11 +4,10 @@ # ################################################################################ -FLAC_VERSION = 1.3.0 +FLAC_VERSION = 1.3.1 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES -FLAC_AUTORECONF = YES FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) FLAC_LICENSE = Xiph BSD-like (libFLAC), GPLv2+ (tools), LGPLv2.1+ (other libraries) FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL From 8c65e51e303ece33442318b78a2ceee7851d5fb2 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 27 Nov 2014 14:00:08 +0000 Subject: [PATCH 090/105] lvm2: bump version to 2.02.113 - Bump version to 2.02.113 - Update the hash value Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/lvm2/lvm2.hash | 2 +- package/lvm2/lvm2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 3d02e8380..adffcdb66 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,2 +1,2 @@ # From ftp://sources.redhat.com/pub/lvm2/md5.sum -md5 1f4033b750f68b68e9bd66d3661a2c3f LVM2.2.02.112.tgz +md5 f71aa8e64030f3d2a3fdabcc36e45094 LVM2.2.02.113.tgz diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index bef22fb87..48a3116de 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.02.112 +LVM2_VERSION = 2.02.113 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_INSTALL_STAGING = YES From 46ede997d4d152d47cdd6f7af47bdc1cf4ed96b6 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 27 Nov 2014 12:12:21 +0000 Subject: [PATCH 091/105] git: bump version to 2.2.0 - Bump version to 2.2.0 - Update the hash value Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 3f8db5f10..33fed8916 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,2 +1,2 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 fe1b06aefa73e8d86cbd352523fc0950b8904ae2ec47085b22b7880f45de6f57 git-2.1.3.tar.xz +sha256 3b87774672bbf35b4d33991dc5119d4eff47c3679e27185312a2b8b36fdad314 git-2.2.0.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index f338438a3..9e931a1cd 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.1.3 +GIT_VERSION = 2.2.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2 LGPLv2.1+ From f2a8f79c0257f35af75c61ecd9f7fd4266f72513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 19 Nov 2014 22:30:34 +0100 Subject: [PATCH 092/105] freescale-imx: Add helper to extract self-extractible binaries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Thomas: - reword the comment of the new macro, and add details about the expected arguments, as suggested by Yann E. Morin. - rework the logic to move the files in $(@D), as it was simply not working in the original patch. $(basename $(1)) was used to get the filename without the extension, but it also contains the full path. $(basename $(notdir $(1))) is needed.] Signed-off-by: Jérôme Pouiller Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/freescale-imx/freescale-imx.mk | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk index c52fc1169..64f3b6b57 100644 --- a/package/freescale-imx/freescale-imx.mk +++ b/package/freescale-imx/freescale-imx.mk @@ -7,4 +7,29 @@ FREESCALE_IMX_VERSION = 3.10.17-1.0.0 FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO +# Helper for self-extracting binaries distributed by Freescale. +# +# The --force option makes sure it doesn't fail if the source +# directory already exists. The --auto-accept skips the license check, +# as it is not needed in Buildroot because we have legal-info. Since +# there's a EULA in the binary file, we extract it in this macro, and +# it should therefore be added to the LICENSE_FILES variable of +# packages using this macro. Also, remember to set REDISTRIBUTE to +# "NO". Indeed, this is a legal minefield: the EULA specifies that the +# Board Support Package includes software and hardware (sic!) for +# which a separate license is needed... +# +# $(1): full path to the archive file +# +define FREESCALE_IMX_EXTRACT_HELPER + awk 'BEGIN { start = 0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /< $(@D)/EULA + cd $(@D) && sh $(1) --force --auto-accept + find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \; + rmdir $(@D)/$(basename $(notdir $(1))) +endef + include $(sort $(wildcard package/freescale-imx/*/*.mk)) From 1d0bbe9a6912f149b4ffb156c151c5e093cbfcc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 19 Nov 2014 22:30:35 +0100 Subject: [PATCH 093/105] firmware-imx: Use self-extractible helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Thomas: remove useless comment about looking in freescale-imx.mk.] Signed-off-by: Jérôme Pouiller Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- .../freescale-imx/firmware-imx/firmware-imx.mk | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index d26b31c1e..f5ed353ae 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -7,27 +7,18 @@ FIRMWARE_IMX_VERSION = $(FREESCALE_IMX_VERSION) FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin + FIRMWARE_IMX_LICENSE = Freescale Semiconductor Software License Agreement, \ Atheros license (ath6k) -FIRMWARE_IMX_LICENSE_FILES = licenses/vpu/EULA licenses/ath6k/AR6102/License.txt -# This is a legal minefield: the EULA specifies that -# the Board Support Package includes software and hardware (sic!) -# for which a separate license is needed... +FIRMWARE_IMX_LICENSE_FILES = EULA licenses/vpu/EULA licenses/ath6k/AR6102/License.txt FIRMWARE_IMX_REDISTRIBUTE = NO FIRMWARE_IMX_BLOBS = ath6k sdma vpu -# The archive is a shell-self-extractor of a bzipped tar. It happens -# to extract in the correct directory (firmware-imx-x.y.z) -# The --force makes sure it doesn't fail if the source dir already exists. -# The --auto-accept skips the license check - not needed for us -# because we have legal-info. define FIRMWARE_IMX_EXTRACT_CMDS - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(FIRMWARE_IMX_SOURCE) --force --auto-accept + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef - define FIRMWARE_IMX_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/lib/firmware for blobdir in $(FIRMWARE_IMX_BLOBS); do \ From 0f0e795d75de91bc0e6082eb99d50cf165bf3d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 19 Nov 2014 22:30:36 +0100 Subject: [PATCH 094/105] imx-vpu: Use self-extractible helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Thomas: remove unneeded comment about seeing freescale-imx.mk.] Signed-off-by: Jérôme Pouiller Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-vpu/imx-vpu.mk | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk index e0292eda5..ab3634d0f 100644 --- a/package/freescale-imx/imx-vpu/imx-vpu.mk +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk @@ -6,8 +6,6 @@ IMX_VPU_VERSION = $(FREESCALE_IMX_VERSION) IMX_VPU_SITE = $(FREESCALE_IMX_SITE) -IMX_VPU_LICENSE = Freescale License -IMX_VPU_LICENSE_FILES = EULA vpu/EULA.txt IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin IMX_VPU_INSTALL_STAGING = YES @@ -21,21 +19,12 @@ IMX_VPU_MAKE_ENV = \ PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) \ INCLUDE="-idirafter $(LINUX_DIR)/include" -# The archive is a shell-self-extractor of a bzipped tar. It happens -# to extract in the correct directory (imx-vpu-x.y.z) -# The --force makes sure it doesn't fail if the source dir already exists. -# The --auto-accept skips the license check - not needed for us -# because we have legal-info -# Since there's a EULA in the bin file, extract it to imx-vpu-x.y.z/EULA -# +IMX_VPU_LICENSE = Freescale Semiconductor Software License Agreement +IMX_VPU_LICENSE_FILES = EULA vpu/EULA.txt +IMX_VPU_REDISTRIBUTE = NO + define IMX_VPU_EXTRACT_CMDS - awk 'BEGIN { start=0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /< $(@D)/EULA - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(IMX_VPU_SOURCE) --force --auto-accept + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_VPU_SOURCE)) endef define IMX_VPU_BUILD_CMDS From 349dfdd4fae14f83daf71dbb7d620451253cab93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 19 Nov 2014 22:30:37 +0100 Subject: [PATCH 095/105] libfslcodec: Use self-extractible helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Thomas: remove unneeded comment.] Signed-off-by: Jérôme Pouiller Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/libfslcodec/libfslcodec.mk | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/package/libfslcodec/libfslcodec.mk b/package/libfslcodec/libfslcodec.mk index 1a364bb7d..fe6f0ba50 100644 --- a/package/libfslcodec/libfslcodec.mk +++ b/package/libfslcodec/libfslcodec.mk @@ -7,30 +7,14 @@ LIBFSLCODEC_VERSION = 3.0.11 LIBFSLCODEC_SITE = $(FREESCALE_IMX_SITE) LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin -LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers) -LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt -# This is a legal minefield: the EULA in the bin file specifies that -# the Board Support Package includes software and hardware (sic!) -# for which a separate license is needed... -LIBFSLCODEC_REDISTRIBUTE = NO - LIBFSLCODEC_INSTALL_STAGING = YES -# The archive is a shell-self-extractor of a bzipped tar. It happens -# to extract in the correct directory (libfslcodec-x.y.z) -# The --force makes sure it doesn't fail if the source dir already exists. -# The --auto-accept skips the license check - not needed for us -# because we have legal-info. -# Since the EULA in the bin file differs from the one in the tar file, -# extract the one from the bin file as well. +LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers) +LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt +LIBFSLCODEC_REDISTRIBUTE = NO + define LIBFSLCODEC_EXTRACT_CMDS - awk 'BEGIN { start=0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /< $(@D)/EULA - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(LIBFSLCODEC_SOURCE) --force --auto-accept + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLCODEC_SOURCE)) endef # FIXME The Makefile installs both the arm9 and arm11 versions of the From 90a40b6bdf8af5922197d757c7b4b4422263cbef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 19 Nov 2014 22:30:38 +0100 Subject: [PATCH 096/105] libfslparser: Use self-extractible helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Thomas: remove unneeded comment.] Signed-off-by: Jérôme Pouiller Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/libfslparser/libfslparser.mk | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/package/libfslparser/libfslparser.mk b/package/libfslparser/libfslparser.mk index d52b15188..706a10e6d 100644 --- a/package/libfslparser/libfslparser.mk +++ b/package/libfslparser/libfslparser.mk @@ -7,30 +7,14 @@ LIBFSLPARSER_VERSION = 3.0.11 LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE) LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin -LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement -LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt -# This is a legal minefield: the EULA in the bin file specifies that -# the Board Support Package includes software and hardware (sic!) -# for which a separate license is needed... -LIBFSLPARSER_REDISTRIBUTE = NO - LIBFSLPARSER_INSTALL_STAGING = YES -# The archive is a shell-self-extractor of a bzipped tar. It happens -# to extract in the correct directory (libfslparser-x.y.z) -# The --force makes sure it doesn't fail if the source dir already exists. -# The --auto-accept skips the license check - not needed for us -# because we have legal-info -# Since the EULA in the bin file differs from the one in the tar file, -# extract the one from the bin file as well. +LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement +LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt +LIBFSLPARSER_REDISTRIBUTE = NO + define LIBFSLPARSER_EXTRACT_CMDS - awk 'BEGIN { start=0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /< $(@D)/EULA - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(LIBFSLPARSER_SOURCE) --force --auto-accept + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLPARSER_SOURCE)) endef # The Makefile installs several versions of the libraries, but we only From c98a4de7b43a2efe85aabce1d597a99304fbe092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 19 Nov 2014 22:30:39 +0100 Subject: [PATCH 097/105] libfslvpuwrap: Use self-extractible helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Thomas: remove unneeded comment.] Signed-off-by: Jérôme Pouiller Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/libfslvpuwrap/libfslvpuwrap.mk | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk index c3a5c1c74..01b299959 100644 --- a/package/libfslvpuwrap/libfslvpuwrap.mk +++ b/package/libfslvpuwrap/libfslvpuwrap.mk @@ -7,30 +7,15 @@ LIBFSLVPUWRAP_VERSION = 1.0.46 LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE) LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin +LIBFSLVPUWRAP_DEPENDENCIES = imx-vpu +LIBFSLVPUWRAP_INSTALL_STAGING = YES + LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement -# N.B.: the content of the two license files is different LIBFSLVPUWRAP_LICENSE_FILES = EULA EULA.txt LIBFSLVPUWRAP_REDISTRIBUTE = NO -LIBFSLVPUWRAP_INSTALL_STAGING = YES - -LIBFSLVPUWRAP_DEPENDENCIES += imx-vpu - -# The archive is a shell-self-extractor of a bzipped tar. It happens -# to extract in the correct directory (libfslvpuwrap-x.y.z) -# The --force makes sure it doesn't fail if the source dir already exists. -# The --auto-accept skips the license check - not needed for us -# because we have legal-info -# Since the EULA in the bin file differs from the one in the tar file, -# extract the one from the bin file as well. define LIBFSLVPUWRAP_EXTRACT_CMDS - awk 'BEGIN { start=0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /< $(@D)/EULA - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) --force --auto-accept + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE)) endef $(eval $(autotools-package)) From 820bd032af3c91139730e372b5faf9c32e295e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Fri, 7 Nov 2014 16:57:51 +0100 Subject: [PATCH 098/105] libz160: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An API for user space programs to perform 2D accelerated graphics operations on AMD GPU [Thomas: - merge in the same patch the patch switching to the freescale-imx extract helper. - remove the dependency on "depends BR2_arm", since anyway the package Config.in file is only included if we are using the i.MX51 or i.MX53 platforms. - use full installation paths (i.e $(INSTALL) -D), and install libraries 755, as it usually done.] Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- package/freescale-imx/Config.in | 3 +++ package/freescale-imx/libz160/Config.in | 5 ++++ package/freescale-imx/libz160/libz160.mk | 29 ++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 package/freescale-imx/libz160/Config.in create mode 100644 package/freescale-imx/libz160/libz160.mk diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index d8c6efc23..71b7f0ba7 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -45,6 +45,9 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM source "package/freescale-imx/imx-lib/Config.in" source "package/freescale-imx/imx-vpu/Config.in" source "package/freescale-imx/firmware-imx/Config.in" +if (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53) +source "package/freescale-imx/libz160/Config.in" +endif if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in" endif diff --git a/package/freescale-imx/libz160/Config.in b/package/freescale-imx/libz160/Config.in new file mode 100644 index 000000000..f956cced4 --- /dev/null +++ b/package/freescale-imx/libz160/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_LIBZ160 + bool "libz160" + help + An API for user space programs to perform 2D accelerated graphics + operations on AMD GPU (included for examples in iMX5x chipsets) diff --git a/package/freescale-imx/libz160/libz160.mk b/package/freescale-imx/libz160/libz160.mk new file mode 100644 index 000000000..55e72179b --- /dev/null +++ b/package/freescale-imx/libz160/libz160.mk @@ -0,0 +1,29 @@ +############################################################# +# +# libz160 +# +############################################################# +LIBZ160_VERSION = 11.09.01 +LIBZ160_SOURCE = libz160-bin-$(LIBZ160_VERSION).bin +LIBZ160_SITE = $(FREESCALE_IMX_SITE) +LIBZ160_INSTALL_STAGING = YES + +# See freescale-imx +LIBZ160_LICENSE = Freescale Semiconductor Software License Agreement +LIBZ160_LICENSE_FILES = EULA +LIBZ160_REDISTRIBUTE = NO + +define LIBZ160_EXTRACT_CMDS + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBZ160_SOURCE)) +endef + +define LIBZ160_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 755 $(@D)/usr/lib/libz160.so $(STAGING_DIR)/usr/lib/libz160.so + $(INSTALL) -D -m 644 $(@D)/usr/include/z160.h $(STAGING_DIR)/usr/include/z160.h +endef + +define LIBZ160_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/usr/lib/libz160.so $(TARGET_DIR)/usr/lib/libz160.so +endef + +$(eval $(generic-package)) From 83aded6ce8dd6244193e08d7a202790c06b1c6c0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 27 Nov 2014 22:31:21 +0100 Subject: [PATCH 099/105] libz160: fix comment header Signed-off-by: Thomas Petazzoni --- package/freescale-imx/libz160/libz160.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/libz160/libz160.mk b/package/freescale-imx/libz160/libz160.mk index 55e72179b..af43b1859 100644 --- a/package/freescale-imx/libz160/libz160.mk +++ b/package/freescale-imx/libz160/libz160.mk @@ -1,8 +1,9 @@ -############################################################# +################################################################################ # # libz160 # -############################################################# +################################################################################ + LIBZ160_VERSION = 11.09.01 LIBZ160_SOURCE = libz160-bin-$(LIBZ160_VERSION).bin LIBZ160_SITE = $(FREESCALE_IMX_SITE) From 939e03fa9fab2c62d73d725d8b0b7627b609cd9c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 27 Nov 2014 19:08:52 -0300 Subject: [PATCH 100/105] wireless-regdb: bump to version 2014.11.18 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/wireless-regdb/wireless-regdb.hash | 2 +- package/wireless-regdb/wireless-regdb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index 3f19793a2..b9eabf1f5 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 4a6861266026c37d1a6b1bc76b863d731765169465999c2a0028103ba4173beb wireless-regdb-2014.11.07.tar.xz +sha256 eab6b50f30748a8b0065ba38cf3df05aac161a5861ae0a6c3cfd01d38a71c9dd wireless-regdb-2014.11.18.tar.xz diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index f37b5a67b..4322fb7d3 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2014.11.07 +WIRELESS_REGDB_VERSION = 2014.11.18 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = http://kernel.org/pub/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC From d1c6a7a6cda96709fde7510515d386b39b3d4db0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 27 Nov 2014 20:51:50 -0300 Subject: [PATCH 101/105] flac: unbreak powerpc e500 support Add patch to avoid the enable/disable-debug options from unsetting -g from CFLAGS in an incorrect way which breaks -mfloat-gprs=X (translit to -mfloatprs=X). It's possible to affect other less common CFLAGS with a '-g' in any position. Upstream status: sent different patch (configure.ac) - to avoid autoreconfiguring. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...igure-don-t-try-to-unset-g-from-CFLAGS.txt | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/flac/0001-configure-don-t-try-to-unset-g-from-CFLAGS.txt diff --git a/package/flac/0001-configure-don-t-try-to-unset-g-from-CFLAGS.txt b/package/flac/0001-configure-don-t-try-to-unset-g-from-CFLAGS.txt new file mode 100644 index 000000000..3aff5a8c9 --- /dev/null +++ b/package/flac/0001-configure-don-t-try-to-unset-g-from-CFLAGS.txt @@ -0,0 +1,27 @@ +The sed expression is wrong, any flags with '-g' in any position gets +zapped, for example: + +-mfloat-gprs=double (for powerpc e500) -> -mfloatprs=double. + +Which gives build errors and is perfectly valid in real use scenarios to +switch from e500v1 (single precision) code to e500v2 (double precision) code. + +Signed-off-by: Gustavo Zacarias + +diff -Nura flac-1.3.1.orig/configure flac-1.3.1/configure +--- flac-1.3.1.orig/configure 2014-11-27 20:43:29.921303105 -0300 ++++ flac-1.3.1/configure 2014-11-27 20:45:33.460250179 -0300 +@@ -19870,11 +19870,10 @@ + + if test "x$debug" = xtrue; then + CPPFLAGS="-DDEBUG $CPPFLAGS" +- CFLAGS=$(echo "$CFLAGS" | sed 's/-g//') +- CFLAGS="-g $CFLAGS" ++ CFLAGS=$(echo "-g $CFLAGS") + else + CPPFLAGS="-DNDEBUG $CPPFLAGS" +- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//') ++ CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//') + CFLAGS="-O3 -funroll-loops $CFLAGS" + fi + From b7e79b839a4ab19b1bda3d136100432999c5b09f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Nov 2014 10:59:02 -0300 Subject: [PATCH 102/105] mpd: bump to version 0.19.5 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index f8bf014d4..f8dc05f0d 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 18f4af89e8b9a434da2b8678b53fc8189da97c1f32e9083512d67217166d3bd8 mpd-0.19.4.tar.xz +sha256 e621e05e7d0e92690f7a1b6ee6f1e502a4d009c69caa4907519282ca571f72cf mpd-0.19.5.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 1369847f6..5448251b7 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.19 -MPD_VERSION = $(MPD_VERSION_MAJOR).4 +MPD_VERSION = $(MPD_VERSION_MAJOR).5 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost libglib2 From 8e1295017cc20bb8beba993a9a82c85cec58fefb Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Nov 2014 11:23:16 -0300 Subject: [PATCH 103/105] dhcpcd: bump to version 6.6.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/dhcpcd/dhcpcd.hash | 2 +- package/dhcpcd/dhcpcd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash index c8ae06490..851849ba7 100644 --- a/package/dhcpcd/dhcpcd.hash +++ b/package/dhcpcd/dhcpcd.hash @@ -1,2 +1,2 @@ # Locally calculated from download (no sig, hash) -sha256 879c81febafc95ed9353909b719af765e9925c6cb06226b79da6c0dd176fe89f dhcpcd-6.6.2.tar.bz2 +sha256 67ba7cfe96089150da8e12badbcc5853daefce39417364887984948bad0a37d0 dhcpcd-6.6.4.tar.bz2 diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index c06002f7b..dc663a808 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCPCD_VERSION = 6.6.2 +DHCPCD_VERSION = 6.6.4 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.bz2 DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd DHCPCD_DEPENDENCIES = host-pkgconf From 51a95551159461e52f204cf6153ca52954438b4d Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 28 Nov 2014 16:43:29 +0000 Subject: [PATCH 104/105] Add a defconfig for MIPS Creator CI20 MIPS Creator CI20 is a Linux and Android development system from MIPS/Imagination Technologies. It incorporates an Ingenic JZ4780 SoC which includes a 1.2GHz dual core MIPS32 processor and Imagination PowerVR SGX540 GPU. More information can be found at: http://elinux.org/MIPS_Creator_CI20 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- board/ci20/readme.txt | 42 ++++++++++++++++++++++++++++++++++++++++++ configs/ci20_defconfig | 18 ++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 board/ci20/readme.txt create mode 100644 configs/ci20_defconfig diff --git a/board/ci20/readme.txt b/board/ci20/readme.txt new file mode 100644 index 000000000..ca7bb5291 --- /dev/null +++ b/board/ci20/readme.txt @@ -0,0 +1,42 @@ +********************* +* MIPS Creator CI20 * +********************* + +The 'ci20_defconfig' will create a root filesystem and a kernel image +under the 'output/images/' directory. This document will try to explain how +to use them in order to run Buildroot in the MIPS Creator CI20 board. + +Assuming you are at the U-Boot prompt of the MIPS Creator CI20, you have to +load the generated kernel image by using the 'tftpboot' command. In +order to do that, you will need to get the network working. Here you +have the instructions to set the ip address, netmask and gateway: + + setenv ipaddr x.x.x.x + setenv netmask x.x.x.x + setenv gatewayip x.x.x.x + +Now you have to set the ip for the TFTP server you are going to load the +kernel image from, and also the name of the kernel image file (we use +'uImage' as a filename in this example): + + setenv serverip x.x.x.x + setenv bootfile uImage + +And finally load the kernel image: + + tftpboot + +Now you have to extract the generated root filesystem into a USB drive +or SD-Card. Here you have the instructions to boot from the two of them. +You have to choose the one your prefer: + +From USB + setenv bootargs console=ttyS4,115200 console=tty0 mem=256M@0x0 +mem=768M@0x30000000 root=/dev/sda1 + +From SD-Card + setenv bootargs console=ttyS4,115200 console=tty0 mem=256M@0x0 +mem=768M@0x30000000 root=/dev/mmcblk0p1 + +And finally run this command to boot the board: + bootm diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig new file mode 100644 index 000000000..7f1bf878b --- /dev/null +++ b/configs/ci20_defconfig @@ -0,0 +1,18 @@ +# architecture +BR2_mipsel=y +BR2_mips_32r2=y +# BR2_MIPS_SOFT_FLOAT is not set + +# system +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.0.8" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS4" + +# kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MIPS/CI20_linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ba11adc7ac8792b0eb7415a1cc9c0968604a6fac" +BR2_LINUX_KERNEL_DEFCONFIG="ci20" From 9b47f40bb29d9be34afabfb423bab0ad45cbc11f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Nov 2014 21:46:39 +0100 Subject: [PATCH 105/105] package/x11r7/xserver_xorg-server: bump version to 1.16.2 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index f118ef207..4db8b0969 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.16.1 +XSERVER_XORG_SERVER_VERSION = 1.16.2 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT