From 88d17384e3d220e62f70176b4a4fe016da286a9a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 10 Feb 2016 14:04:35 -0300 Subject: [PATCH 001/206] gssdp: bump to version 0.14.14 Which also means moving from unstable->stable (odd numbers on gnome project packages are development). Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gssdp/gssdp.hash | 4 ++-- package/gssdp/gssdp.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gssdp/gssdp.hash b/package/gssdp/gssdp.hash index 09b8532d56..fe7d9815d3 100644 --- a/package/gssdp/gssdp.hash +++ b/package/gssdp/gssdp.hash @@ -1,2 +1,2 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/0.13/gssdp-0.13.2.sha256sum: -sha256 8f663f8a72b66254f5c20a3610ff853ac8d00bf6f253828e37e51579caa34dce gssdp-0.13.2.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/0.14/gssdp-0.14.14.sha256sum: +sha256 685718755b5b8d24aaeadda44047e515443784712891fc53879ab9a4865b48d6 gssdp-0.14.14.tar.xz diff --git a/package/gssdp/gssdp.mk b/package/gssdp/gssdp.mk index d9459a1e01..6ba125253b 100644 --- a/package/gssdp/gssdp.mk +++ b/package/gssdp/gssdp.mk @@ -4,8 +4,8 @@ # ################################################################################ -GSSDP_VERSION_MAJOR = 0.13 -GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).2 +GSSDP_VERSION_MAJOR = 0.14 +GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).14 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR) GSSDP_LICENSE = LGPLv2+ From a279cf74bcea4f57f5bd2887b8e8a43026a2197f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 10 Feb 2016 14:04:36 -0300 Subject: [PATCH 002/206] gupnp: bump to version 0.20.16 Which also means moving from unstable->stable (odd numbers in gnome project packages are development). Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gupnp/gupnp.hash | 4 ++-- package/gupnp/gupnp.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index 597cb4224c..4208ecda9b 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,2 +1,2 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/0.19/gupnp-0.19.4.sha256sum: -sha256 3c1fb2873cb2f8f152b9d49598d55b15b8f3c1096a03ade46ce69694798fb243 gupnp-0.19.4.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/0.20/gupnp-0.20.16.sha256sum: +sha256 ff1119eff12529c46837e03c742f69dc4fae48d59097d79582d38a383b832602 gupnp-0.20.16.tar.xz diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index 85faaa4734..c3ec0a0ba8 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -4,8 +4,8 @@ # ################################################################################ -GUPNP_VERSION_MAJOR = 0.19 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).4 +GUPNP_VERSION_MAJOR = 0.20 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).16 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPLv2+ From 338ae5762dc01050fe62b25babd4c1b37d024bb0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 10 Feb 2016 14:04:37 -0300 Subject: [PATCH 003/206] gupnp-av: bump to version 0.12.8 Which also means moving from unstable->stable (odd numbers in gnome project packages are development). Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gupnp-av/gupnp-av.hash | 4 ++-- package/gupnp-av/gupnp-av.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gupnp-av/gupnp-av.hash b/package/gupnp-av/gupnp-av.hash index 0101ed4f5d..b97317195f 100644 --- a/package/gupnp-av/gupnp-av.hash +++ b/package/gupnp-av/gupnp-av.hash @@ -1,2 +1,2 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.11/gupnp-av-0.11.6.sha256sum: -sha256 401991336babb18c4ebed16e75e0b4d3e5848cff7bb878bbfd54a5d15203c4cc gupnp-av-0.11.6.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.12/gupnp-av-0.12.8.sha256sum: +sha256 759bc7d46aff894c282d17f508d9b5be82de96aa74b10cb6b0fc6c5e07cc273c gupnp-av-0.12.8.tar.xz diff --git a/package/gupnp-av/gupnp-av.mk b/package/gupnp-av/gupnp-av.mk index 6360c93ccc..5835155155 100644 --- a/package/gupnp-av/gupnp-av.mk +++ b/package/gupnp-av/gupnp-av.mk @@ -4,8 +4,8 @@ # ################################################################################ -GUPNP_AV_VERSION_MAJOR = 0.11 -GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).6 +GUPNP_AV_VERSION_MAJOR = 0.12 +GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).8 GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz GUPNP_AV_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) GUPNP_AV_LICENSE = LGPLv2+ From 3c3fad5bf54a2e574d624b7a5c9f16660754d6db Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 10 Feb 2016 07:37:37 -0300 Subject: [PATCH 004/206] freetype: bump to version 2.6.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/freetype/freetype.hash | 6 +++--- package/freetype/freetype.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index dc238f2003..45f91df558 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,3 +1,3 @@ -# From http://sourceforge.net/projects/freetype/files/freetype2/2.6.2/ -md5 86109d0c998787d81ac582bad9adf82e freetype-2.6.2.tar.bz2 -sha1 29c22b85b77cb22cf95c13e7062e21f39fe6b17a freetype-2.6.2.tar.bz2 +# From http://sourceforge.net/projects/freetype/files/freetype2/2.6.3/ +md5 0037b25a8c090bc8a1218e867b32beb1 freetype-2.6.3.tar.bz2 +sha1 6c98bd5d0be313207c37ca23d25faf983486aee5 freetype-2.6.3.tar.bz2 diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index fa11b0ca3d..d95c424fa5 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.6.2 +FREETYPE_VERSION = 2.6.3 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION) FREETYPE_INSTALL_STAGING = YES From 580c518f89f882a045f1f058593198814c539590 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 10 Feb 2016 10:13:01 -0300 Subject: [PATCH 005/206] openldap: bump to version 2.4.44 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/openldap/openldap.hash | 8 ++++---- package/openldap/openldap.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/openldap/openldap.hash b/package/openldap/openldap.hash index 83e790f77e..785c4897f5 100644 --- a/package/openldap/openldap.hash +++ b/package/openldap/openldap.hash @@ -1,4 +1,4 @@ -# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.43.md5 -md5 49ca65e27891fcf977d78c10f073c705 openldap-2.4.43.tgz -# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.43.sha1 -sha1 3b52924df2f45e81f25ecbe37551bc837d090cfa openldap-2.4.43.tgz +# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.44.md5 +md5 693ac26de86231f8dcae2b4e9d768e51 openldap-2.4.44.tgz +# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.44.sha1 +sha1 016a738d050a68d388602a74b5e991035cdba149 openldap-2.4.44.tgz diff --git a/package/openldap/openldap.mk b/package/openldap/openldap.mk index 17bf991e25..2f738e51de 100644 --- a/package/openldap/openldap.mk +++ b/package/openldap/openldap.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLDAP_VERSION = 2.4.43 +OPENLDAP_VERSION = 2.4.44 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz OPENLDAP_SITE = http://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License From 455d97555ab96c01e2fc8dd661ad2cdc876ffbf8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 10 Feb 2016 11:47:45 -0300 Subject: [PATCH 006/206] libsodium: bump to version 1.0.8 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libsodium/libsodium.hash | 2 +- package/libsodium/libsodium.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsodium/libsodium.hash b/package/libsodium/libsodium.hash index 3544237041..8b7955519c 100644 --- a/package/libsodium/libsodium.hash +++ b/package/libsodium/libsodium.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 940d03ea7d2caa7940e24564bf6d9f66d6edd1df1e0111ff8e3655f3b864fb59 libsodium-1.0.6.tar.gz +sha256 c0f191d2527852641e0a996b7b106d2e04cbc76ea50731b2d0babd3409301926 libsodium-1.0.8.tar.gz diff --git a/package/libsodium/libsodium.mk b/package/libsodium/libsodium.mk index 09bc7776ae..bd6f58d343 100644 --- a/package/libsodium/libsodium.mk +++ b/package/libsodium/libsodium.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSODIUM_VERSION = 1.0.6 +LIBSODIUM_VERSION = 1.0.8 LIBSODIUM_SITE = https://download.libsodium.org/libsodium/releases LIBSODIUM_LICENSE = ISC LIBSODIUM_LICENSE_FILES = LICENSE From f01a3f509b5ab5a01a345b6f2a87ea63262fb7f8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 10 Feb 2016 11:47:46 -0300 Subject: [PATCH 007/206] zermoq: bump to version 4.1.4 Drop 0003-Problem-return-code-of-sodium_init-is-not-checked.patch since it's in this release. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...n-code-of-sodium_init-is-not-checked.patch | 73 ------------------- package/zeromq/zeromq.hash | 4 +- package/zeromq/zeromq.mk | 2 +- 3 files changed, 3 insertions(+), 76 deletions(-) delete mode 100644 package/zeromq/0003-Problem-return-code-of-sodium_init-is-not-checked.patch diff --git a/package/zeromq/0003-Problem-return-code-of-sodium_init-is-not-checked.patch b/package/zeromq/0003-Problem-return-code-of-sodium_init-is-not-checked.patch deleted file mode 100644 index fcdbc9cde1..0000000000 --- a/package/zeromq/0003-Problem-return-code-of-sodium_init-is-not-checked.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 479db2113643e459c11db392e0fefd6400657c9e Mon Sep 17 00:00:00 2001 -From: Constantin Rack -Date: Sat, 8 Nov 2014 10:50:17 +0100 -Subject: [PATCH] Problem: return code of sodium_init() is not checked. - -There are two todo comments in curve_client.cpp and curve_server.cpp that suggest -checking the return code of sodium_init() call. sodium_init() returns -1 on error, -0 on success and 1 if it has been called before and is already initalized: -https://github.com/jedisct1/libsodium/blob/master/src/libsodium/sodium/core.c - -Signed-off-by: Gustavo Zacarias ---- -Status: Upstream - -diff --git a/src/curve_client.cpp b/src/curve_client.cpp -index 6019c54..77fc420 100644 ---- a/src/curve_client.cpp -+++ b/src/curve_client.cpp -@@ -38,6 +38,7 @@ zmq::curve_client_t::curve_client_t (const options_t &options_) : - cn_peer_nonce(1), - sync() - { -+ int rc; - memcpy (public_key, options_.curve_public_key, crypto_box_PUBLICKEYBYTES); - memcpy (secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES); - memcpy (server_key, options_.curve_server_key, crypto_box_PUBLICKEYBYTES); -@@ -47,12 +48,12 @@ zmq::curve_client_t::curve_client_t (const options_t &options_) : - unsigned char tmpbytes[4]; - randombytes(tmpbytes, 4); - #else -- // todo check return code -- sodium_init(); -+ rc = sodium_init (); -+ zmq_assert (rc != -1); - #endif - - // Generate short-term key pair -- const int rc = crypto_box_keypair (cn_public, cn_secret); -+ rc = crypto_box_keypair (cn_public, cn_secret); - zmq_assert (rc == 0); - } - -diff --git a/src/curve_server.cpp b/src/curve_server.cpp -index a3c4243..22c32d6 100644 ---- a/src/curve_server.cpp -+++ b/src/curve_server.cpp -@@ -42,6 +42,7 @@ zmq::curve_server_t::curve_server_t (session_base_t *session_, - cn_peer_nonce(1), - sync() - { -+ int rc; - // Fetch our secret key from socket options - memcpy (secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES); - scoped_lock_t lock (sync); -@@ -50,12 +51,12 @@ zmq::curve_server_t::curve_server_t (session_base_t *session_, - unsigned char tmpbytes[4]; - randombytes(tmpbytes, 4); - #else -- // todo check return code -- sodium_init(); -+ rc = sodium_init (); -+ zmq_assert (rc != -1); - #endif - - // Generate short-term key pair -- const int rc = crypto_box_keypair (cn_public, cn_secret); -+ rc = crypto_box_keypair (cn_public, cn_secret); - zmq_assert (rc == 0); - } - --- -2.4.10 - diff --git a/package/zeromq/zeromq.hash b/package/zeromq/zeromq.hash index b744740781..a3eeb451ca 100644 --- a/package/zeromq/zeromq.hash +++ b/package/zeromq/zeromq.hash @@ -1,4 +1,4 @@ # From http://download.zeromq.org/SHA1SUMS: -sha1 b7185724f2fd56d0face50047757ac2a04d26ca4 zeromq-4.1.3.tar.gz +sha1 b632a4b6f8a14390dc17824e37ff7b10831ce2b4 zeromq-4.1.4.tar.gz # Calculated based on the hash above -sha256 61b31c830db377777e417235a24d3660a4bcc3f40d303ee58df082fcd68bf411 zeromq-4.1.3.tar.gz +sha256 e99f44fde25c2e4cb84ce440f87ca7d3fe3271c2b8cfbc67d55e4de25e6fe378 zeromq-4.1.4.tar.gz diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk index ab30b78c8c..ce01e50f62 100644 --- a/package/zeromq/zeromq.mk +++ b/package/zeromq/zeromq.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZEROMQ_VERSION = 4.1.3 +ZEROMQ_VERSION = 4.1.4 ZEROMQ_SITE = http://download.zeromq.org ZEROMQ_INSTALL_STAGING = YES ZEROMQ_DEPENDENCIES = util-linux From a325525376f148a8b81e20e87b0d59bc242defe2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 10 Feb 2016 11:47:47 -0300 Subject: [PATCH 008/206] cppzmq: bump to version 68a7b09c Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/cppzmq/cppzmq.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cppzmq/cppzmq.mk b/package/cppzmq/cppzmq.mk index 5446de8b6d..113b9a070e 100644 --- a/package/cppzmq/cppzmq.mk +++ b/package/cppzmq/cppzmq.mk @@ -4,7 +4,7 @@ # ################################################################################ -CPPZMQ_VERSION = 1f05e0d111197c64be32ad5aecd59f4d1b05a819 +CPPZMQ_VERSION = 68a7b09cfce01c4c279fba2cf91686fcfc566848 CPPZMQ_SITE = $(call github,zeromq,cppzmq,$(CPPZMQ_VERSION)) CPPZMQ_INSTALL_STAGING = YES CPPZMQ_DEPENDENCIES = zeromq From 4e27632e4cd4fb15252455f9ddfeaf9c394a504e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 10 Feb 2016 16:04:52 -0300 Subject: [PATCH 009/206] wireless-regdb: bump to version 2016.02.08 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 cafc6318c4..868502049b 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 013e07d988f5cd7d24e4aa7a6cd406615d441ea6b882a02d2a46a78edeb2cfb6 wireless-regdb-2015.12.14.tar.xz +sha256 ce957b7f4fe103d8fb4d160d3b39825ad0b0da639b7453d4022d71415b6c9f9f wireless-regdb-2016.02.08.tar.xz diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 38d1c261f1..083ab00ad4 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2015.12.14 +WIRELESS_REGDB_VERSION = 2016.02.08 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 c06a0f50d6cfdf87dd7baf7fb97d7b6a1ca5c30d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 11 Feb 2016 15:13:23 -0300 Subject: [PATCH 010/206] usb-modeswitch: bump to version 2.3.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/usb_modeswitch/usb_modeswitch.hash | 2 +- package/usb_modeswitch/usb_modeswitch.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/usb_modeswitch/usb_modeswitch.hash b/package/usb_modeswitch/usb_modeswitch.hash index 2033d31104..075ef63bab 100644 --- a/package/usb_modeswitch/usb_modeswitch.hash +++ b/package/usb_modeswitch/usb_modeswitch.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7ee42be2fe26dde20c58f54bf678fb136d2706250e4aa74f06fc97268a46e90f usb-modeswitch-2.2.6.tar.bz2 +sha256 f93e940c2eb0c585a5d2210177338e68a9b24f409e351e4a854132453246b894 usb-modeswitch-2.3.0.tar.bz2 diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk index aca13e4f90..ac41a80c70 100644 --- a/package/usb_modeswitch/usb_modeswitch.mk +++ b/package/usb_modeswitch/usb_modeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -USB_MODESWITCH_VERSION = 2.2.6 +USB_MODESWITCH_VERSION = 2.3.0 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DEPENDENCIES = libusb From d00d10b2b5f751ce85e109028a4b5892f5f772f5 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 11 Feb 2016 15:13:24 -0300 Subject: [PATCH 011/206] usb-modeswitch-data: bump to version 20160112 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/usb_modeswitch_data/usb_modeswitch_data.hash | 2 +- package/usb_modeswitch_data/usb_modeswitch_data.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.hash b/package/usb_modeswitch_data/usb_modeswitch_data.hash index 05a544528e..0df5475ea3 100644 --- a/package/usb_modeswitch_data/usb_modeswitch_data.hash +++ b/package/usb_modeswitch_data/usb_modeswitch_data.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 584d362bc0060c02016edaac7b05ebd6558d5dcbdf14f1ae6d0ec9630265a982 usb-modeswitch-data-20151101.tar.bz2 +sha256 d679a44a48b1d1f243fea6b4d2bd54e0e08010ff579dd81eaf698954c0c6dfa7 usb-modeswitch-data-20160112.tar.bz2 diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.mk b/package/usb_modeswitch_data/usb_modeswitch_data.mk index d8d5622395..a0cbc126df 100644 --- a/package/usb_modeswitch_data/usb_modeswitch_data.mk +++ b/package/usb_modeswitch_data/usb_modeswitch_data.mk @@ -4,7 +4,7 @@ # ################################################################################ -USB_MODESWITCH_DATA_VERSION = 20151101 +USB_MODESWITCH_DATA_VERSION = 20160112 USB_MODESWITCH_DATA_SOURCE = usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION).tar.bz2 USB_MODESWITCH_DATA_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DATA_DEPENDENCIES = usb_modeswitch From 07f31cc869f6119172d59290f6c5830284f522bf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 9 Feb 2016 19:53:26 +0100 Subject: [PATCH 012/206] package/x11r7/xserver_xorg-server: bump version to 1.18.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/Config.in | 4 ++-- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index ac1369e0f4..007843db87 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -70,7 +70,7 @@ choice bool "X Window System server version" config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18 - bool "1.18.0" + bool "1.18.1" select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20 select BR2_PACKAGE_XPROTO_PRESENTPROTO @@ -82,7 +82,7 @@ endchoice config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION string - default "1.18.0" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18 + default "1.18.1" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18 default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 choice diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 72c00c402f..602439503b 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,6 @@ # From http://lists.x.org/archives/xorg-announce/2014-June/002440.html sha1 7a95765e56b124758fcd7b609589e65b8870880b xorg-server-1.14.7.tar.bz2 sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2 -# From http://lists.x.org/archives/xorg-announce/2015-November/002655.html -sha1 f37f9ca17d211552c775c3ce78ff03385026bf3a xorg-server-1.18.0.tar.bz2 -sha256 195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e xorg-server-1.18.0.tar.bz2 +# From https://lists.freedesktop.org/archives/xorg-announce/2016-February/002674.html +sha1 968fe85773a41296199f8733c7235c8623d7c460 xorg-server-1.18.1.tar.bz2 +sha256 85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d xorg-server-1.18.1.tar.bz2 From 1ec39edb96bbaf76799c6bbf3ebb625f94a47bab Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 12 Feb 2016 13:06:07 -0300 Subject: [PATCH 013/206] nano: bump to version 2.5.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/nano/nano.hash | 2 +- package/nano/nano.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 8b458470f8..b7ddc505f6 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 e06fca01bf183f4d531aa65a28dffc0e2d10185239909eb3de797023f3453bde nano-2.5.1.tar.gz +sha256 89bd6ac5120880d2a95431d8bad22bf92c7ccbf10b8f1716d4ea062f3faeeb41 nano-2.5.2.tar.gz diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 0fa90093de..4d77ea4a7e 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -4,7 +4,7 @@ # ################################################################################ -NANO_VERSION = 2.5.1 +NANO_VERSION = 2.5.2 NANO_SITE = $(BR2_GNU_MIRROR)/nano NANO_LICENSE = GPLv3+ NANO_LICENSE_FILES = COPYING From 3a041c6e3747bdf9d64f61300cf0a1d067053fef Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Fri, 12 Feb 2016 12:13:08 +0100 Subject: [PATCH 014/206] libqmi: bump to 1.12.8 Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index a2c37d3c8c..df0bb0b88c 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 0857bffece4e8ddfa7f721dd9ca63b4c78de345ac9ae2faebf04062cacba3780 libqmi-1.12.6.tar.xz +sha256 d23a397d9c963f637c99622df74ed08a2ba2276552c21eea1ed1d05eeafc82a7 libqmi-1.12.8.tar.xz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index 1bc612126b..0ff20a6df4 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.12.6 +LIBQMI_VERSION = 1.12.8 LIBQMI_SITE = http://www.freedesktop.org/software/libqmi LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz LIBQMI_LICENSE = LGPLv2+ (library), GPLv2+ (programs) From 67c7fe48c947c9eb94a89fc3ea24e4ff61f78da8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 14 Feb 2016 10:29:33 +0100 Subject: [PATCH 015/206] package/libass: bump version to 0.13.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libass/libass.hash | 2 +- package/libass/libass.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libass/libass.hash b/package/libass/libass.hash index 87d3f269e4..88f15f4880 100644 --- a/package/libass/libass.hash +++ b/package/libass/libass.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 e0071a3b2e95411c8d474014678368e3f0b852f7d663e0564b344e7335eb0671 libass-0.13.0.tar.xz +sha256 4aa36b1876a61cab46fc9284fee84224b9e2840fe7b3e63d96a8d32574343fe7 libass-0.13.1.tar.xz diff --git a/package/libass/libass.mk b/package/libass/libass.mk index 2f0ca08a39..df0c7ae126 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.13.0 +LIBASS_VERSION = 0.13.1 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz # Do not use the github helper here, the generated tarball is *NOT* # the same as the one uploaded by upstream for the release. From 0df58de040bfa33985466114017310282557f2ea Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 14 Feb 2016 10:29:34 +0100 Subject: [PATCH 016/206] package/libnfs: bump version to 1.10.0 Removed m4-hack after upstream adding m4/ to its repo: https://github.com/sahlberg/libnfs/commit/8338c7e27f4fa3a120d8ee901611aaa3e390d576 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libnfs/libnfs.hash | 2 +- package/libnfs/libnfs.mk | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/package/libnfs/libnfs.hash b/package/libnfs/libnfs.hash index 14d304fca0..27a9e5d349 100644 --- a/package/libnfs/libnfs.hash +++ b/package/libnfs/libnfs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 e95af693e763a504eee72dacf3dc6c1001d83e40b807e7e1d0be2eaf48af779c libnfs-libnfs-1.9.8.tar.gz +sha256 7f6c62a05c7e0f0749f2b13f178a4ed7aaf17bd09e65a10bb147bfe9807da272 libnfs-libnfs-1.10.0.tar.gz diff --git a/package/libnfs/libnfs.mk b/package/libnfs/libnfs.mk index 40d5cebbe6..e49656b7bf 100644 --- a/package/libnfs/libnfs.mk +++ b/package/libnfs/libnfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFS_VERSION = libnfs-1.9.8 +LIBNFS_VERSION = libnfs-1.10.0 LIBNFS_SITE = $(call github,sahlberg,libnfs,$(LIBNFS_VERSION)) LIBNFS_INSTALL_STAGING = YES LIBNFS_AUTORECONF = YES @@ -17,10 +17,4 @@ ifeq ($(BR2_PACKAGE_LIBTIRPC),y) LIBNFS_DEPENDENCIES += libtirpc endif -# Needed for autoreconf -define LIBNFS_MAKE_M4_DIR - mkdir $(@D)/m4 -endef -LIBNFS_POST_EXTRACT_HOOKS += LIBNFS_MAKE_M4_DIR - $(eval $(autotools-package)) From 2686c4f962bb0acc7dabc935468ae3a27943db5d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 14 Feb 2016 10:29:35 +0100 Subject: [PATCH 017/206] package/libv4l: bump version to 1.10.0 Removed patches applied upstream and unneeded autoreconf call. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...keytable-fix-missing-libintl-linking.patch | 57 --------- ...-priv.h-Use-off_t-instead-of-__off_t.patch | 111 ------------------ ...se-ENABLE_NLS-for-locale-related-cod.patch | 110 ----------------- ...ly-expose-jpeg_mem_-protoypes-when-J.patch | 56 --------- package/libv4l/libv4l.hash | 2 +- package/libv4l/libv4l.mk | 6 +- 6 files changed, 2 insertions(+), 340 deletions(-) delete mode 100644 package/libv4l/0002-dvb-keytable-fix-missing-libintl-linking.patch delete mode 100644 package/libv4l/0003-libv4lsyscall-priv.h-Use-off_t-instead-of-__off_t.patch delete mode 100644 package/libv4l/0004-utils-Properly-use-ENABLE_NLS-for-locale-related-cod.patch delete mode 100644 package/libv4l/0005-libv4lconvert-only-expose-jpeg_mem_-protoypes-when-J.patch diff --git a/package/libv4l/0002-dvb-keytable-fix-missing-libintl-linking.patch b/package/libv4l/0002-dvb-keytable-fix-missing-libintl-linking.patch deleted file mode 100644 index 1b89961d76..0000000000 --- a/package/libv4l/0002-dvb-keytable-fix-missing-libintl-linking.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 9eec274c2a92beb2bb1a3a1eeffef1988c7dd016 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 16 Oct 2015 20:32:45 +0200 -Subject: [PATCH] dvb/keytable: fix missing libintl linking - -Patch upstream at -http://git.linuxtv.org/v4l-utils.git/commit/?id=ceaec539b62d83ffb5fdb5231e574a6adef0bf83. - -Signed-off-by: Peter Seiderer ---- - utils/dvb/Makefile.am | 8 ++++---- - utils/keytable/Makefile.am | 1 + - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/utils/dvb/Makefile.am b/utils/dvb/Makefile.am -index 6aae408..a96a1a2 100644 ---- a/utils/dvb/Makefile.am -+++ b/utils/dvb/Makefile.am -@@ -2,19 +2,19 @@ bin_PROGRAMS = dvb-fe-tool dvbv5-zap dvbv5-scan dvb-format-convert - man_MANS = dvb-fe-tool.1 dvbv5-zap.1 dvbv5-scan.1 dvb-format-convert.1 - - dvb_fe_tool_SOURCES = dvb-fe-tool.c --dvb_fe_tool_LDADD = ../../lib/libdvbv5/libdvbv5.la -+dvb_fe_tool_LDADD = ../../lib/libdvbv5/libdvbv5.la @LIBINTL@ - dvb_fe_tool_LDFLAGS = $(ARGP_LIBS) -lm - - dvbv5_zap_SOURCES = dvbv5-zap.c --dvbv5_zap_LDADD = ../../lib/libdvbv5/libdvbv5.la -+dvbv5_zap_LDADD = ../../lib/libdvbv5/libdvbv5.la @LIBINTL@ - dvbv5_zap_LDFLAGS = $(ARGP_LIBS) -lm - - dvbv5_scan_SOURCES = dvbv5-scan.c --dvbv5_scan_LDADD = ../../lib/libdvbv5/libdvbv5.la -+dvbv5_scan_LDADD = ../../lib/libdvbv5/libdvbv5.la @LIBINTL@ - dvbv5_scan_LDFLAGS = $(ARGP_LIBS) -lm - - dvb_format_convert_SOURCES = dvb-format-convert.c --dvb_format_convert_LDADD = ../../lib/libdvbv5/libdvbv5.la -+dvb_format_convert_LDADD = ../../lib/libdvbv5/libdvbv5.la @LIBINTL@ - dvb_format_convert_LDFLAGS = $(ARGP_LIBS) -lm - - EXTRA_DIST = README -diff --git a/utils/keytable/Makefile.am b/utils/keytable/Makefile.am -index 925c8ea..8444ac2 100644 ---- a/utils/keytable/Makefile.am -+++ b/utils/keytable/Makefile.am -@@ -5,6 +5,7 @@ keytablesystem_DATA = $(srcdir)/rc_keymaps/* - udevrules_DATA = 70-infrared.rules - - ir_keytable_SOURCES = keytable.c parse.h -+ir_keytable_LDADD = @LIBINTL@ - ir_keytable_LDFLAGS = $(ARGP_LIBS) - - EXTRA_DIST = 70-infrared.rules rc_keymaps rc_keymaps_userspace gen_keytables.pl ir-keytable.1 rc_maps.cfg --- -2.1.4 - diff --git a/package/libv4l/0003-libv4lsyscall-priv.h-Use-off_t-instead-of-__off_t.patch b/package/libv4l/0003-libv4lsyscall-priv.h-Use-off_t-instead-of-__off_t.patch deleted file mode 100644 index 7868d71ea6..0000000000 --- a/package/libv4l/0003-libv4lsyscall-priv.h-Use-off_t-instead-of-__off_t.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 87369a8d190a182ee087cec5164e4c9586b0d80e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 28 Oct 2015 09:27:47 +0100 -Subject: [PATCH] libv4lsyscall-priv.h: Use off_t instead of __off_t - -__off_t is a kernel internal symbol, which happens to be user-visible -with glibc, but not necessarily with other C libraries such as -musl. In v4l-utils code, it's mainly used for the mmap() prototype, -but the mmap() manpage really uses off_t, not __off_t. - -Switching from __off_t to off_t allows the code to build properly with -musl. - -Patch upstream at -http://git.linuxtv.org/v4l-utils.git/commit/?id=a6ff0635f7ed3400eec25039b96002b60a44209b. - -Signed-off-by: Thomas Petazzoni ---- - lib/libv4l1/v4l1compat.c | 3 +-- - lib/libv4l2/v4l2convert.c | 5 ++--- - lib/libv4lconvert/libv4lsyscall-priv.h | 11 +++-------- - 3 files changed, 6 insertions(+), 13 deletions(-) - -diff --git a/lib/libv4l1/v4l1compat.c b/lib/libv4l1/v4l1compat.c -index 97e8c4e..e5c9e56 100644 ---- a/lib/libv4l1/v4l1compat.c -+++ b/lib/libv4l1/v4l1compat.c -@@ -29,7 +29,6 @@ - #include - #include - #include --#include "../libv4lconvert/libv4lsyscall-priv.h" /* for __off_t */ - - #include - #include -@@ -119,7 +118,7 @@ LIBV4L_PUBLIC ssize_t read(int fd, void *buffer, size_t n) - } - - LIBV4L_PUBLIC void *mmap(void *start, size_t length, int prot, int flags, int fd, -- __off_t offset) -+ off_t offset) - { - return v4l1_mmap(start, length, prot, flags, fd, offset); - } -diff --git a/lib/libv4l2/v4l2convert.c b/lib/libv4l2/v4l2convert.c -index a6dc30e..7b7e253 100644 ---- a/lib/libv4l2/v4l2convert.c -+++ b/lib/libv4l2/v4l2convert.c -@@ -39,7 +39,6 @@ - #include - #include - #include --#include "../libv4lconvert/libv4lsyscall-priv.h" - #include - #include - -@@ -151,14 +150,14 @@ LIBV4L_PUBLIC ssize_t read(int fd, void *buffer, size_t n) - } - - LIBV4L_PUBLIC void *mmap(void *start, size_t length, int prot, int flags, int fd, -- __off_t offset) -+ off_t offset) - { - return v4l2_mmap(start, length, prot, flags, fd, offset); - } - - #if defined(linux) && defined(__GLIBC__) - LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags, int fd, -- __off64_t offset) -+ off64_t offset) - { - return v4l2_mmap(start, length, prot, flags, fd, offset); - } -diff --git a/lib/libv4lconvert/libv4lsyscall-priv.h b/lib/libv4lconvert/libv4lsyscall-priv.h -index f548fb2..f87eff4 100644 ---- a/lib/libv4lconvert/libv4lsyscall-priv.h -+++ b/lib/libv4lconvert/libv4lsyscall-priv.h -@@ -59,11 +59,6 @@ - #define _IOC_SIZE(cmd) IOCPARM_LEN(cmd) - #define MAP_ANONYMOUS MAP_ANON - #define MMAP2_PAGE_SHIFT 0 --typedef off_t __off_t; --#endif -- --#if defined(ANDROID) --typedef off_t __off_t; - #endif - - #undef SYS_OPEN -@@ -95,15 +90,15 @@ typedef off_t __off_t; - #if defined(__FreeBSD__) - #define SYS_MMAP(addr, len, prot, flags, fd, off) \ - __syscall(SYS_mmap, (void *)(addr), (size_t)(len), \ -- (int)(prot), (int)(flags), (int)(fd), (__off_t)(off)) -+ (int)(prot), (int)(flags), (int)(fd), (off_t)(off)) - #elif defined(__FreeBSD_kernel__) - #define SYS_MMAP(addr, len, prot, flags, fd, off) \ - syscall(SYS_mmap, (void *)(addr), (size_t)(len), \ -- (int)(prot), (int)(flags), (int)(fd), (__off_t)(off)) -+ (int)(prot), (int)(flags), (int)(fd), (off_t)(off)) - #else - #define SYS_MMAP(addr, len, prot, flags, fd, off) \ - syscall(SYS_mmap2, (void *)(addr), (size_t)(len), \ -- (int)(prot), (int)(flags), (int)(fd), (__off_t)((off) >> MMAP2_PAGE_SHIFT)) -+ (int)(prot), (int)(flags), (int)(fd), (off_t)((off) >> MMAP2_PAGE_SHIFT)) - #endif - - #define SYS_MUNMAP(addr, len) \ --- -2.6.2 - diff --git a/package/libv4l/0004-utils-Properly-use-ENABLE_NLS-for-locale-related-cod.patch b/package/libv4l/0004-utils-Properly-use-ENABLE_NLS-for-locale-related-cod.patch deleted file mode 100644 index 2be74cc127..0000000000 --- a/package/libv4l/0004-utils-Properly-use-ENABLE_NLS-for-locale-related-cod.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 12e5dded4747bf3a3f1eb392a17d10e46ecbc90b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 28 Oct 2015 09:29:08 +0100 -Subject: [PATCH] utils: Properly use ENABLE_NLS for locale related code - -Various tools in utils/ use ENABLE_NLS to decide whether locale -support is available or not, and only include if ENABLE_NLS -is defined. However, they unconditionally use functions defined in - such as setlocale(), bindtextdomain() or textdomain(), -which causes build failures when the prototypes of such functions are -not available due to not being included. - -In order to fix this, we add ENABLE_NLS conditionals around the calls -to these functions. - -Patch upstream at: -http://git.linuxtv.org/v4l-utils.git/commit/?id=defad307a09c11ba989e6338bb0293c0e1acba87. - -Signed-off-by: Thomas Petazzoni ---- - utils/dvb/dvb-fe-tool.c | 2 ++ - utils/dvb/dvb-format-convert.c | 2 ++ - utils/dvb/dvbv5-scan.c | 2 ++ - utils/dvb/dvbv5-zap.c | 2 ++ - utils/keytable/keytable.c | 2 ++ - 5 files changed, 10 insertions(+) - -diff --git a/utils/dvb/dvb-fe-tool.c b/utils/dvb/dvb-fe-tool.c -index efc2ebf..ba01aa9 100644 ---- a/utils/dvb/dvb-fe-tool.c -+++ b/utils/dvb/dvb-fe-tool.c -@@ -276,9 +276,11 @@ int main(int argc, char *argv[]) - struct dvb_v5_fe_parms *parms; - int fe_flags = O_RDWR; - -+#ifdef ENABLE_NLS - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); -+#endif - - argp_parse(&argp, argc, argv, ARGP_NO_HELP | ARGP_NO_EXIT, 0, 0); - -diff --git a/utils/dvb/dvb-format-convert.c b/utils/dvb/dvb-format-convert.c -index e39df03..09451d4 100644 ---- a/utils/dvb/dvb-format-convert.c -+++ b/utils/dvb/dvb-format-convert.c -@@ -132,9 +132,11 @@ int main(int argc, char **argv) - .args_doc = N_(" "), - }; - -+#ifdef ENABLE_NLS - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); -+#endif - - memset(&args, 0, sizeof(args)); - argp_parse(&argp, argc, argv, ARGP_NO_HELP | ARGP_NO_EXIT, &idx, &args); -diff --git a/utils/dvb/dvbv5-scan.c b/utils/dvb/dvbv5-scan.c -index be1586d..1bb0ced 100644 ---- a/utils/dvb/dvbv5-scan.c -+++ b/utils/dvb/dvbv5-scan.c -@@ -461,9 +461,11 @@ int main(int argc, char **argv) - .args_doc = N_(""), - }; - -+#ifdef ENABLE_NLS - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); -+#endif - - memset(&args, 0, sizeof(args)); - args.sat_number = -1; -diff --git a/utils/dvb/dvbv5-zap.c b/utils/dvb/dvbv5-zap.c -index 2812166..848259b 100644 ---- a/utils/dvb/dvbv5-zap.c -+++ b/utils/dvb/dvbv5-zap.c -@@ -758,9 +758,11 @@ int main(int argc, char **argv) - .args_doc = N_(" [or if in monitor mode]"), - }; - -+#ifdef ENABLE_NLS - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); -+#endif - - memset(&args, 0, sizeof(args)); - args.sat_number = -1; -diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c -index 3bf0618..d6d187f 100644 ---- a/utils/keytable/keytable.c -+++ b/utils/keytable/keytable.c -@@ -1467,9 +1467,11 @@ int main(int argc, char *argv[]) - static struct sysfs_names *names; - struct rc_device rc_dev; - -+#ifdef ENABLE_NLS - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); -+#endif - - argp_parse(&argp, argc, argv, ARGP_NO_HELP | ARGP_NO_EXIT, 0, 0); - --- -2.6.2 - diff --git a/package/libv4l/0005-libv4lconvert-only-expose-jpeg_mem_-protoypes-when-J.patch b/package/libv4l/0005-libv4lconvert-only-expose-jpeg_mem_-protoypes-when-J.patch deleted file mode 100644 index 1868fd3045..0000000000 --- a/package/libv4l/0005-libv4lconvert-only-expose-jpeg_mem_-protoypes-when-J.patch +++ /dev/null @@ -1,56 +0,0 @@ -From d468d1bba973999f2f1103ebaf7df5c8440a5499 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 21 Jan 2016 10:22:16 +0100 -Subject: [PATCH] libv4lconvert: only expose jpeg_mem_*() protoypes when - JPEG_LIB_VERSION < 80 - -The jpeg_memsrcdest.c file implements jpeg_mem_src() and -jpeg_mem_dest() when JPEG_LIB_VERSION < 80 in order to provide those -functions to libv4lconvert when the libjpeg library being used is too -old. - -However, the jpeg_memsrcdest.h file exposes the prototypes of those -functions unconditionally. Until now, the prototype was matching the -one of the functions exposed by libjpeg (when JPEG_LIB_VERSION >= 80), -so there was no problem. - -But since the release of libjpeg 9b (in January 2016), they changed -the second argument of jpeg_mem_src() from "unsigned char *" to "const -unsigned char*". Therefore, there are two prototypes for the -jpeg_mem_src() function: one from libjpeg, one from libv4l, and they -conflict with each other. - -To resolve this situation, this patch modifies jpeg_memsrcdest.h to -only expose the prototypes when libv4l is implementing the functions -(i.e when JPEG_LIB_VERSION < 80). When JPEG_LIB_VERSION >= 80, the -prototypes will come from . - -Patch upstream at: -http://git.linuxtv.org/v4l-utils.git/commit/?id=0b33f4c87cb26644ea662455acbc1649858b151f. - -Signed-off-by: Thomas Petazzoni ---- - lib/libv4lconvert/jpeg_memsrcdest.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/lib/libv4lconvert/jpeg_memsrcdest.h b/lib/libv4lconvert/jpeg_memsrcdest.h -index e971182..28a6477 100644 ---- a/lib/libv4lconvert/jpeg_memsrcdest.h -+++ b/lib/libv4lconvert/jpeg_memsrcdest.h -@@ -1,5 +1,7 @@ - #include - -+#if JPEG_LIB_VERSION < 80 -+ - void - jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, - unsigned long bufsize); -@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, - void - jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, - unsigned long * outsize); -+ -+#endif --- -2.6.4 - diff --git a/package/libv4l/libv4l.hash b/package/libv4l/libv4l.hash index d79ccbc9ff..d58296f90c 100644 --- a/package/libv4l/libv4l.hash +++ b/package/libv4l/libv4l.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2f6219b03f19ea07c100e860238d5cdbfcbcfe440a14477e75137cc073431b33 v4l-utils-1.8.1.tar.bz2 +sha256 78ead27ee58a701d7c6342303cf4520bdd4a2b88a7813bc99a0b389307e4336b v4l-utils-1.10.0.tar.bz2 diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index ceb1666773..bdd28bf8dc 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -4,17 +4,13 @@ # ################################################################################ -LIBV4L_VERSION = 1.8.1 +LIBV4L_VERSION = 1.10.0 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils LIBV4L_INSTALL_STAGING = YES LIBV4L_DEPENDENCIES = host-pkgconf LIBV4L_CONF_OPTS = --disable-doxygen-doc -# patch touches Makefile.am (and needs host-gettext for autoreconf) -LIBV4L_AUTORECONF= YES -LIBV4L_DEPENDENCIES += host-gettext - # fix uclibc-ng configure/compile LIBV4L_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From e4e6a3a186f58bee3566eb1aaa5b8a311fb515c8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 14 Feb 2016 10:29:36 +0100 Subject: [PATCH 018/206] package/mjpg-streamer: added optional dependency to libv4l Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mjpg-streamer/mjpg-streamer.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/mjpg-streamer/mjpg-streamer.mk b/package/mjpg-streamer/mjpg-streamer.mk index e54c6006f9..a710af6fc7 100644 --- a/package/mjpg-streamer/mjpg-streamer.mk +++ b/package/mjpg-streamer/mjpg-streamer.mk @@ -14,8 +14,13 @@ MJPG_STREAMER_LICENSE = GPLv2+ MJPG_STREAMER_LICENSE_FILES = LICENSE MJPG_STREAMER_DEPENDENCIES = jpeg +ifeq ($(BR2_PACKAGE_LIBV4L),y) +MJPG_STREAMER_DEPENDENCIES += libv4l +MJPG_STREAMER_USE_LIBV4L += USE_LIBV4L2=true +endif + define MJPG_STREAMER_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" -C $(@D) $(MJPG_STREAMER_USE_LIBV4L) endef define MJPG_STREAMER_INSTALL_TARGET_CMDS From 01dd888bca7df2c5510b2e129758170b4ded2bae Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 12 Feb 2016 20:43:23 +0100 Subject: [PATCH 019/206] package/{mesa3d, mesa3d-headers}: bump version to 11.1.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 4 ++-- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 2c32b163c7..5cad42d238 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 11.1.1 +MESA3D_HEADERS_VERSION = 11.1.2 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION) MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 2ad543c354..695c5359df 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,2 +1,2 @@ -# From http://lists.freedesktop.org/archives/mesa-announce/2016-January/000196.html -sha256 64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20 mesa-11.1.1.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2016-February/000199.html +sha256 8f72aead896b340ba0f7a4a474bfaf71681f5d675592aec1cb7ba698e319148b mesa-11.1.2.tar.xz diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 7ed6af0380..ff2f932823 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 11.1.1 +MESA3D_VERSION = 11.1.2 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos From 7eeed78bfa0fc8a771b5c3c42b86cdcfaf6df0f2 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sun, 14 Feb 2016 23:03:30 +0100 Subject: [PATCH 020/206] package/mono: bump to version 4.2.2.30 This patch bumps mono to the latest 4.2.2.30 version. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/mono/mono.hash | 2 +- package/mono/mono.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mono/mono.hash b/package/mono/mono.hash index 001f6be7e0..37e0e8b64e 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 b7b461fe04375f621d88166ba8c6f1cb33c439fd3e17136460f7d087a51ed792 mono-4.2.1.102.tar.bz2 +sha256 57858cd033be9915d7abdc5158c1faae8fa05757c3b7117cab3d703aa696c56b mono-4.2.2.30.tar.bz2 diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 8f99983377..e50ef504ae 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONO_VERSION = 4.2.1.102 +MONO_VERSION = 4.2.2.30 MONO_SITE = http://download.mono-project.com/sources/mono MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2 MONO_LICENSE = GPLv2 or MIT (compiler, tools), LGPLv2 (runtime libs), MIT (class libs) or commercial From ed1cecb269668a6cd4aa0bb59341f1dc6868df8c Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sun, 14 Feb 2016 23:03:31 +0100 Subject: [PATCH 021/206] package/monolinte: updating download url Latest mono revision changed download url for monolite, updating it. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/monolite/monolite.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/monolite/monolite.mk b/package/monolite/monolite.mk index 3c53bff5aa..761e776ab8 100644 --- a/package/monolite/monolite.mk +++ b/package/monolite/monolite.mk @@ -5,7 +5,7 @@ ################################################################################ MONOLITE_VERSION = 138 -MONOLITE_SITE = http://storage.bos.xamarin.com/mono-dist-master/latest +MONOLITE_SITE = http://download.mono-project.com/monolite/ MONOLITE_SOURCE = monolite-$(MONOLITE_VERSION)-latest.tar.gz MONOLITE_LICENSE = LGPLv2 or commercial From 1c8769eeb0aa723e2ce2cae4692d918aee66a784 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Mon, 15 Feb 2016 04:27:28 +0000 Subject: [PATCH 022/206] linux-firmware: add support for MT7601u MT7601u is a MediaTek Wifi 802.11n dongle (New chipset from the combined ralink/mediaTek company) Signed-off-by: Matt Weber Signed-off-by: Thomas Petazzoni --- package/linux-firmware/Config.in | 5 +++++ package/linux-firmware/linux-firmware.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index d8389864ad..97d64ca4a8 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -189,6 +189,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897 help Firmware files for the Marvell Wifi-Ex 8897 module on PCI-E. +config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U + bool "MediaTek MT7601U" + help + MediaTek MT7601U + config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61 bool "Ralink rt2501/rt61" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 083a381ea0..4667c4cd2d 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -165,6 +165,12 @@ LINUX_FIRMWARE_FILES += mrvl/pcie8897_uapsta.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell endif +# MT7601 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U),y) +LINUX_FIRMWARE_FILES += mt7601u.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware +endif + # wl127x ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X),y) # wl1271-nvs.bin is a symlink to wl127x-nvs.bin From dd0220e32fcdae7cf4c42044123fa53ad8921e0a Mon Sep 17 00:00:00 2001 From: Fabio Porcedda Date: Mon, 15 Feb 2016 18:57:00 +0100 Subject: [PATCH 023/206] barebox: bump to version 2016.02.0 Signed-off-by: Fabio Porcedda Signed-off-by: Thomas Petazzoni --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 39cb5d2cde..363ac2be7c 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2016.01.0" + bool "2016.02.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2016.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2016.02.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index b6e18690d7..a5d526a4ab 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,5 +1,5 @@ -# http://www.barebox.org/download/barebox-2015.12.0.tar.bz2.md5 -md5 99f8c1252e3085e4b3a4e365ff36e9bd barebox-2016.01.0.tar.bz2 +# http://www.barebox.org/download/barebox-2016.02.0.tar.bz2.md5 +md5 451cf8d025af6acbe7aaa2596541550f barebox-2016.02.0.tar.bz2 # Locally calculated -sha256 f0bb34b745b9c8c626186e22b0154f57c15d0eec5de1e3654f740665b2136d91 barebox-2016.01.0.tar.bz2 +sha256 1b4760e535994f950c10ef407ff59cf5c0ed97ab30476b9054e1f65d3e372eff barebox-2016.02.0.tar.bz2 From 69880c8839010e5127691a27c0d19f6233b04a61 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 16 Feb 2016 12:50:15 -0300 Subject: [PATCH 024/206] cantarell: bump to version 0.21 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/cantarell/cantarell.hash | 4 ++-- package/cantarell/cantarell.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cantarell/cantarell.hash b/package/cantarell/cantarell.hash index d776647ef7..5d8284df5b 100644 --- a/package/cantarell/cantarell.hash +++ b/package/cantarell/cantarell.hash @@ -1,2 +1,2 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.20.1.sha256sum -sha256 0f933516f3270fb7307d9c2e26e4703b403608c5cc9da3127cba4395bcd4ec91 cantarell-fonts-0.0.20.1.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.21.sha256sum +sha256 2d3e925574648f0902c61975f84acac445ee9cda826280644bdf772960b46e85 cantarell-fonts-0.0.21.tar.xz diff --git a/package/cantarell/cantarell.mk b/package/cantarell/cantarell.mk index aaad85a82d..c677c78f4b 100644 --- a/package/cantarell/cantarell.mk +++ b/package/cantarell/cantarell.mk @@ -5,7 +5,7 @@ ################################################################################ CANTARELL_VERSION_MAJOR = 0.0 -CANTARELL_VERSION = $(CANTARELL_VERSION_MAJOR).20.1 +CANTARELL_VERSION = $(CANTARELL_VERSION_MAJOR).21 CANTARELL_SITE = http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/$(CANTARELL_VERSION_MAJOR) CANTARELL_SOURCE = cantarell-fonts-$(CANTARELL_VERSION).tar.xz CANTARELL_DEPENDENCIES = host-pkgconf From b88c1d149df5c1b783407365a24dc6efc497f7cf Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Tue, 16 Feb 2016 11:21:20 +0000 Subject: [PATCH 025/206] package/nodejs: bump version to 5.6.0 This is an important security release. See https://nodejs.org/en/blog/release/v5.6.0/ for further details Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- .../0001-Remove-dependency-on-Python-bz2-module.patch | 0 .../0002-gyp-force-link-command-to-use-CXX.patch | 0 ...3-Use-a-python-variable-instead-of-hardcoding-Python.patch | 0 .../{5.5.0 => 5.6.0}/0004-Fix-va_list-not-declared.patch | 0 .../{5.5.0 => 5.6.0}/0005-Fix-support-for-uClibc-ng.patch | 0 package/nodejs/Config.in | 2 +- package/nodejs/nodejs.hash | 4 ++-- 7 files changed, 3 insertions(+), 3 deletions(-) rename package/nodejs/{5.5.0 => 5.6.0}/0001-Remove-dependency-on-Python-bz2-module.patch (100%) rename package/nodejs/{5.5.0 => 5.6.0}/0002-gyp-force-link-command-to-use-CXX.patch (100%) rename package/nodejs/{5.5.0 => 5.6.0}/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch (100%) rename package/nodejs/{5.5.0 => 5.6.0}/0004-Fix-va_list-not-declared.patch (100%) rename package/nodejs/{5.5.0 => 5.6.0}/0005-Fix-support-for-uClibc-ng.patch (100%) diff --git a/package/nodejs/5.5.0/0001-Remove-dependency-on-Python-bz2-module.patch b/package/nodejs/5.6.0/0001-Remove-dependency-on-Python-bz2-module.patch similarity index 100% rename from package/nodejs/5.5.0/0001-Remove-dependency-on-Python-bz2-module.patch rename to package/nodejs/5.6.0/0001-Remove-dependency-on-Python-bz2-module.patch diff --git a/package/nodejs/5.5.0/0002-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/5.6.0/0002-gyp-force-link-command-to-use-CXX.patch similarity index 100% rename from package/nodejs/5.5.0/0002-gyp-force-link-command-to-use-CXX.patch rename to package/nodejs/5.6.0/0002-gyp-force-link-command-to-use-CXX.patch diff --git a/package/nodejs/5.5.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch b/package/nodejs/5.6.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch similarity index 100% rename from package/nodejs/5.5.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch rename to package/nodejs/5.6.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch diff --git a/package/nodejs/5.5.0/0004-Fix-va_list-not-declared.patch b/package/nodejs/5.6.0/0004-Fix-va_list-not-declared.patch similarity index 100% rename from package/nodejs/5.5.0/0004-Fix-va_list-not-declared.patch rename to package/nodejs/5.6.0/0004-Fix-va_list-not-declared.patch diff --git a/package/nodejs/5.5.0/0005-Fix-support-for-uClibc-ng.patch b/package/nodejs/5.6.0/0005-Fix-support-for-uClibc-ng.patch similarity index 100% rename from package/nodejs/5.5.0/0005-Fix-support-for-uClibc-ng.patch rename to package/nodejs/5.6.0/0005-Fix-support-for-uClibc-ng.patch diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index cdf770552d..bec0eee0b8 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -43,7 +43,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS config BR2_PACKAGE_NODEJS_VERSION_STRING string - default "5.5.0" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS + default "5.6.0" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS default "0.10.41" menu "Module Selection" diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index e65f14ada0..ccad648909 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ # From upstream URL: http://nodejs.org/dist/v0.10.41/SHASUMS256.txt sha256 79f694e2a5c42543b75d0c69f6860499d7593136d0f6b59e7163b9e66fb2c995 node-v0.10.41.tar.gz -# From upstream URL: http://nodejs.org/dist/v5.5.0/SHASUMS256.txt -sha256 9c46b4dc9548e43826f71f6571f56e39783c456b9516045b496ea73321731e22 node-v5.5.0.tar.xz +# From upstream URL: http://nodejs.org/dist/v5.6.0/SHASUMS256.txt +sha256 588341e466ac72f6b8e9fa500f04edf149f7d4e8141c4175c495d6d1484405e3 node-v5.6.0.tar.xz From 3a8d20e33a2620e38c56a7874ee3d8f045a4c685 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 16 Feb 2016 10:17:08 -0300 Subject: [PATCH 026/206] sqlite: bump to version 3.11.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/sqlite/sqlite.hash | 4 ++-- package/sqlite/sqlite.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 1f07794096..7a218dc5b8 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,4 +1,4 @@ # From http://www.sqlite.org/download.html -sha1 ea4156fc3f6a4a4a2752a5a3ac5c5b3fe7e1a24b sqlite-autoconf-3100200.tar.gz +sha1 e2d300e4b24af5ecd67a1396488893fa44864e36 sqlite-autoconf-3110000.tar.gz # Calculated based on the hash above -sha256 a2b3b4bd1291ea7d6c8252f7edff36a4362f2f0e5d5370444ba6cbe313ae2971 sqlite-autoconf-3100200.tar.gz +sha256 508d4dcbcf7a7181e95c717a1dc4ae3c0880b3d593be0c4b40abb6c3a0e201fb sqlite-autoconf-3110000.tar.gz diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 1603e006e6..0a119cc30e 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITE_VERSION = 3100200 +SQLITE_VERSION = 3110000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2016 SQLITE_LICENSE = Public domain From b14f8ebab3a92ef0537bd18e63628f2a0bbd239c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 16 Feb 2016 10:17:24 -0300 Subject: [PATCH 027/206] musl: bump to version 1.1.13 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/musl/musl.hash | 2 +- package/musl/musl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/musl/musl.hash b/package/musl/musl.hash index b13659949b..0970ad6b1a 100644 --- a/package/musl/musl.hash +++ b/package/musl/musl.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e musl-1.1.12.tar.gz +sha256 bbacdc64f557d0c4857f7d2daf592c32c29aec1babbb94fcf01a2e05bed15013 musl-1.1.13.tar.gz diff --git a/package/musl/musl.mk b/package/musl/musl.mk index 2cc6699a35..d68e769e84 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUSL_VERSION = 1.1.12 +MUSL_VERSION = 1.1.13 MUSL_SITE = http://www.musl-libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT From 3ad518b61d896a5f61d05ef8d878708bd7be3f94 Mon Sep 17 00:00:00 2001 From: Mamatha Inamdar Date: Sun, 14 Feb 2016 16:31:40 +0530 Subject: [PATCH 028/206] package/nvme: new package Add support for building NVME utility - a utility for interacting with standard NVM Express (optimized PCI Express SSD interface) devices. Signed-off-by: Mamatha Inamdar Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/nvme/Config.in | 7 +++++++ package/nvme/nvme.hash | 2 ++ package/nvme/nvme.mk | 23 +++++++++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 package/nvme/Config.in create mode 100644 package/nvme/nvme.hash create mode 100755 package/nvme/nvme.mk diff --git a/package/Config.in b/package/Config.in index 529ad33649..21be9f6b16 100644 --- a/package/Config.in +++ b/package/Config.in @@ -407,6 +407,7 @@ endif source "package/neard/Config.in" source "package/nvidia-driver/Config.in" source "package/nvidia-tegra23/Config.in" + source "package/nvme/Config.in" source "package/ofono/Config.in" source "package/ola/Config.in" source "package/on2-8170-modules/Config.in" diff --git a/package/nvme/Config.in b/package/nvme/Config.in new file mode 100644 index 0000000000..dd8655fa1a --- /dev/null +++ b/package/nvme/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_NVME + bool "nvme" + help + NVME utility, a utility for interacting with standard NVM + Express (optimized PCI Express SSD interface) devices. + + https://github.com/linux-nvme/nvme-cli diff --git a/package/nvme/nvme.hash b/package/nvme/nvme.hash new file mode 100644 index 0000000000..b299041960 --- /dev/null +++ b/package/nvme/nvme.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 c631e90dd4d411cdb618b26bc36b06706e6f1f2d3db38874bcfe48f4bc15aac4 nvme-v0.3.tar.gz diff --git a/package/nvme/nvme.mk b/package/nvme/nvme.mk new file mode 100755 index 0000000000..8cb886367e --- /dev/null +++ b/package/nvme/nvme.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# nvme +# +################################################################################ + +NVME_VERSION = v0.3 +NVME_SITE = $(call github,linux-nvme,nvme-cli,$(NVME_VERSION)) +NVME_LICENSE = GPLv2+ +NVME_LICENSE_FILES = COPYING + +# LIBUDEV=1 means that libudev is _disabled_ +define NVME_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + LIBUDEV=1 -C $(@D) +endef + +define NVME_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \ + PREFIX=/usr install-bin +endef + +$(eval $(generic-package)) From ee2dc86c675c7975402d95b8a94177de22c0eb80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Tue, 9 Feb 2016 22:10:58 +0100 Subject: [PATCH 029/206] wine: Bump to version 1.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumping to stable version 1.8.1 Upstreamed patch is finally dropped. Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- ...to-override-the-location-of-the-conf.patch | 109 ------------------ package/wine/wine.hash | 2 +- package/wine/wine.mk | 4 +- 3 files changed, 2 insertions(+), 113 deletions(-) delete mode 100644 package/wine/0001-configure-allow-to-override-the-location-of-the-conf.patch diff --git a/package/wine/0001-configure-allow-to-override-the-location-of-the-conf.patch b/package/wine/0001-configure-allow-to-override-the-location-of-the-conf.patch deleted file mode 100644 index 9fc9f64aac..0000000000 --- a/package/wine/0001-configure-allow-to-override-the-location-of-the-conf.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 18078feecc8da0ab2693d0bb5423489fa62920ef Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 22 Dec 2015 21:25:19 +0100 -Subject: [PATCH] configure: allow to override the location of the *-config - scripts - -Currently, the configure.ac calls a number of *-config scripts to get -details about installed libraries. It assumes that those *-config -scripts are readily available in the PATH. - -While this is true in most situations, it may not be true when -cross-compiling: you may have the *-config scripts matching the target -environment in a location that isn't in the PATH. For such situations, -it is very useful to be able to override the location of such *-config -scripts using environment variables. - -The proposed changes does not introduce any functional difference if -you don't pass those new environment variables: if they are not -passed, it falls back to the current value. - -However, if those *_CONFIG variables are passed, then they are used as -the path to the corresponding *-config script. - -The ${FOO_CONFIG:-foo-config} construct is POSIX compliant, so it is -available in all shells. - -(Patch submitted upstream.) - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 86f12c5..37ceab5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1191,7 +1191,7 @@ dnl **** Check for libxml2 **** - if test "x$with_xml" != "xno" - then - WINE_PACKAGE_FLAGS(XML2,[libxml-2.0],[-lxml2], -- [`xml2-config --cflags 2>/dev/null`],[`xml2-config --libs 2>/dev/null`], -+ [`${XML2_CONFIG:-xml2-config} --cflags 2>/dev/null`],[`${XML2_CONFIG:-xml2-config} --libs 2>/dev/null`], - [AC_CHECK_HEADERS([libxml/parser.h libxml/xmlsave.h libxml/SAX2.h]) - if test "$ac_cv_header_libxml_parser_h" = "yes" -a "$ac_cv_header_libxml_xmlsave_h" = "yes" -a "$ac_cv_header_libxml_SAX2_h" = "yes" - then -@@ -1220,7 +1220,7 @@ WINE_WARNING_WITH(xml,[test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"], - if test "x$with_xslt" != "xno" - then - WINE_PACKAGE_FLAGS(XSLT,[libxslt],[-lxml2], -- [`xslt-config --cflags 2>/dev/null`],[`xslt-config --libs 2>/dev/null`], -+ [`${XSLT_CONFIG:-xslt-config} --cflags 2>/dev/null`],[`${XSLT_CONFIG:-xslt-config} --libs 2>/dev/null`], - [AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h],,, - [#ifdef HAVE_LIBXSLT_PATTERN_H - # include -@@ -1291,7 +1291,7 @@ WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurse - dnl **** Check for SANE **** - if test "x$with_sane" != "xno" - then -- WINE_PACKAGE_FLAGS(SANE,[libsane],,[`sane-config --cflags 2>/dev/null`],[`sane-config --ldflags 2>/dev/null`], -+ WINE_PACKAGE_FLAGS(SANE,[libsane],,[`${SANE_CONFIG:-sane-config} --cflags 2>/dev/null`],[`${SANE_CONFIG:-sane-config} --ldflags 2>/dev/null`], - [AC_CHECK_HEADER(sane/sane.h, - [WINE_CHECK_SONAME(sane,sane_init,,[SANE_CFLAGS=""],[$SANE_LIBS])], - [SANE_CFLAGS=""])]) -@@ -1311,7 +1311,7 @@ dnl **** Check for libgphoto2 **** - if test "x$with_gphoto" != "xno" - then - WINE_PACKAGE_FLAGS(GPHOTO2,[libgphoto2],[-lgphoto2], -- [`gphoto2-config --cflags 2>/dev/null`],[`gphoto2-config --libs 2>/dev/null`], -+ [`${GPHOTO2_CONFIG:-gphoto2-config} --cflags 2>/dev/null`],[`${GPHOTO2_CONFIG:-gphoto2-config} --libs 2>/dev/null`], - [AC_CHECK_HEADER(gphoto2-camera.h, - [AC_CHECK_LIB(gphoto2,gp_camera_new, - [AC_DEFINE(HAVE_GPHOTO2, 1, [Define if we have the libgphoto2 development environment])], -@@ -1319,8 +1319,8 @@ then - [$GPHOTO2_LIBS])], - [GPHOTO2_LIBS=""; GPHOTO2_CFLAGS=""])]) - WINE_PACKAGE_FLAGS(GPHOTO2_PORT,[libgphoto2_port],[-lgphoto2_port], -- [`gphoto2-port-config --cflags 2>/dev/null`], -- [`gphoto2-port-config --libs 2>/dev/null`], -+ [`${GPHOTO2_PORT_CONFIG:-gphoto2-port-config} --cflags 2>/dev/null`], -+ [`${GPHOTO2_PORT_CONFIG:-gphoto2-port-config} --libs 2>/dev/null`], - [AC_CHECK_HEADER(gphoto2-port.h, - [AC_CHECK_LIB(gphoto2_port,gp_port_info_list_new, - [AC_DEFINE(HAVE_GPHOTO2_PORT, 1, [Define if we have the libgphoto2_port development environment])], -@@ -1382,8 +1382,8 @@ dnl **** Check for FreeType 2 **** - if test "x$with_freetype" != "xno" - then - WINE_PACKAGE_FLAGS(FREETYPE,[freetype2],[-lfreetype], -- [`(freetype-config --cflags || freetype2-config --cflags) 2>/dev/null`], -- [`(freetype-config --libs || freetype2-config --libs) 2>/dev/null`], -+ [`(${FREETYPE_CONFIG:-freetype-config} --cflags || ${FREETYPE2_CONFIG:-freetype2-config} --cflags) 2>/dev/null`], -+ [`(${FREETYPE_CONFIG:-freetype-config} --libs || ${FREETYPE2_CONFIG:-freetype2-config} --libs) 2>/dev/null`], - [AC_CHECK_HEADERS([ft2build.h]) - if test "$ac_cv_header_ft2build_h" = "yes" - then -@@ -1538,8 +1538,8 @@ AC_SUBST(CUPS_CFLAGS,"") - if test "x$with_cups" != "xno" - then - ac_save_CPPFLAGS="$CPPFLAGS" -- ac_cups_cflags=`cups-config --cflags 2>/dev/null` -- ac_cups_libs=`cups-config --ldflags 2>/dev/null` -+ ac_cups_cflags=`${CUPS_CONFIG:-cups-config} --cflags 2>/dev/null` -+ ac_cups_libs=`${CUPS_CONFIG:-cups-config} --ldflags 2>/dev/null` - CPPFLAGS="$CPPFLAGS $ac_cups_cflags" - AC_CHECK_HEADERS(cups/cups.h, - [WINE_CHECK_SONAME(cups,cupsGetDefault, --- -2.6.4 - diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 80c0f68bd9..31db6c04e2 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 f33b45c18112b2071fbf9edee0e8c575407f9e2a9855ca4ee918ed33efa7c6f4 wine-1.8.tar.bz2 +sha256 149ad3daaf8593b36c5c061285df0ec2a25e20ea48c61323be91088c4d22ca97 wine-1.8.1.tar.bz2 diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 2cd5c302ce..fc04027b74 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,14 +4,12 @@ # ################################################################################ -WINE_VERSION = 1.8 +WINE_VERSION = 1.8.1 WINE_SOURCE = wine-$(WINE_VERSION).tar.bz2 WINE_SITE = https://dl.winehq.org/wine/source/1.8 WINE_LICENSE = LGPLv2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_DEPENDENCIES = host-bison host-flex host-wine -# For 0001-sane-config-fix.patch -WINE_AUTORECONF = YES # Wine needs its own directory structure and tools for cross compiling WINE_CONF_OPTS = \ From 16690601030eb1d4e911ab82d3e0309919524b92 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 17 Feb 2016 11:03:47 +0100 Subject: [PATCH 030/206] pv: bump to version 1.6.0 And drop patch now upstream. Signed-off-by: Peter Korsgaard --- .../pv/0001-add-lstat64-to-64-emulation.patch | 22 ------------------- package/pv/pv.hash | 2 +- package/pv/pv.mk | 2 +- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 package/pv/0001-add-lstat64-to-64-emulation.patch diff --git a/package/pv/0001-add-lstat64-to-64-emulation.patch b/package/pv/0001-add-lstat64-to-64-emulation.patch deleted file mode 100644 index a2aa4f56b5..0000000000 --- a/package/pv/0001-add-lstat64-to-64-emulation.patch +++ /dev/null @@ -1,22 +0,0 @@ -[PATCH] add lstat64 to *64 emulation - -pv nowadays also uses lstat64, so add it to the emulation defines for !LFS -builds. - -Signed-off-by: Peter Korsgaard ---- - autoconf/header.in | 1 + - 1 file changed, 1 insertion(+) - -Index: pv-1.5.7/autoconf/header.in -=================================================================== ---- pv-1.5.7.orig/autoconf/header.in -+++ pv-1.5.7/autoconf/header.in -@@ -76,6 +76,7 @@ - # endif - # define open64 open - # define lseek64 lseek -+# define lstat64 lstat - #endif - - #undef HAVE_IPC diff --git a/package/pv/pv.hash b/package/pv/pv.hash index 4120a811c6..291d6dd06f 100644 --- a/package/pv/pv.hash +++ b/package/pv/pv.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 c8535061bb703086b67fa540da162ad48d6ecd219ae74157111465adfdef5997 pv-1.5.7.tar.bz2 +sha256 0ece824e0da27b384d11d1de371f20cafac465e038041adab57fcf4b5036ef8d pv-1.6.0.tar.bz2 diff --git a/package/pv/pv.mk b/package/pv/pv.mk index 47f570f8be..2279805a65 100644 --- a/package/pv/pv.mk +++ b/package/pv/pv.mk @@ -4,7 +4,7 @@ # ################################################################################ -PV_VERSION = 1.5.7 +PV_VERSION = 1.6.0 PV_SOURCE = pv-$(PV_VERSION).tar.bz2 PV_SITE = http://www.ivarch.com/programs/sources PV_LICENSE = Artistic-2.0 From 2cb39521e382746674a3756a4c0224a5f360ddaf Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Tue, 2 Feb 2016 17:38:33 +0100 Subject: [PATCH 031/206] yajl: Bump version to 2.1.0 Remove 0001-math-link.patch as some added code render it useless. Rework 0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch because it did not apply anymore. This patch is already in a PR upstream. Add 0001-cmake-uClibc-Fix-missing-libm-for-tests.patch, to fix a build error with uClibc toolchain. This has been sent upstream: https://github.com/lloyd/yajl/pull/184 Signed-off-by: Maxime Hadjinlian Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- ...ke-uClibc-Fix-missing-libm-for-tests.patch | 30 ++++++++++++++ package/yajl/0001-math-link.patch | 24 ------------ ...ared-library-build-when-BUILD_SHARED.patch | 39 +++++++++++-------- package/yajl/yajl.hash | 2 +- package/yajl/yajl.mk | 2 +- 5 files changed, 54 insertions(+), 43 deletions(-) create mode 100644 package/yajl/0001-cmake-uClibc-Fix-missing-libm-for-tests.patch delete mode 100644 package/yajl/0001-math-link.patch diff --git a/package/yajl/0001-cmake-uClibc-Fix-missing-libm-for-tests.patch b/package/yajl/0001-cmake-uClibc-Fix-missing-libm-for-tests.patch new file mode 100644 index 0000000000..08553f9459 --- /dev/null +++ b/package/yajl/0001-cmake-uClibc-Fix-missing-libm-for-tests.patch @@ -0,0 +1,30 @@ +From a36814a6f9fbb62f49897f9fb1e68d204602e199 Mon Sep 17 00:00:00 2001 +From: Maxime Hadjinlian +Date: Tue, 2 Feb 2016 17:28:31 +0100 +Subject: [PATCH] cmake: uClibc: Fix missing libm for tests + +At the link time, the tests are not linked against libm which cause an +error with uClibc based toolchain: + +../../yajl-2.1.0/lib/libyajl.so.2.1.0: undefined reference to `__isnan' +../../yajl-2.1.0/lib/libyajl.so.2.1.0: undefined reference to `__isinf' + +Signed-off-by: Maxime Hadjinlian +--- + test/api/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/api/CMakeLists.txt b/test/api/CMakeLists.txt +index cd65a54..e0ce2f6 100644 +--- a/test/api/CMakeLists.txt ++++ b/test/api/CMakeLists.txt +@@ -21,5 +21,5 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../../${YAJL_DIST_NAME}/lib) + FOREACH (test ${TESTS}) + GET_FILENAME_COMPONENT(testProg ${test} NAME_WE) + ADD_EXECUTABLE(${testProg} ${test}) +- TARGET_LINK_LIBRARIES(${testProg} yajl) ++ TARGET_LINK_LIBRARIES(${testProg} yajl m) + ENDFOREACH() +-- +2.7.0 + diff --git a/package/yajl/0001-math-link.patch b/package/yajl/0001-math-link.patch deleted file mode 100644 index 355a24856f..0000000000 --- a/package/yajl/0001-math-link.patch +++ /dev/null @@ -1,24 +0,0 @@ -[PATCH] fix json_reformat linking on uClibc - -json_reformat calls yajl_gen_* functions, which internally use isnan() / -isinf(). On Glibc, these are provided by libc, but on uClibc you need to -link with -lm (like the spec says), so ensure we do so. - -Signed-off-by: Peter Korsgaard ---- - reformatter/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: yajl-2.0.2/reformatter/CMakeLists.txt -=================================================================== ---- yajl-2.0.2.orig/reformatter/CMakeLists.txt -+++ yajl-2.0.2/reformatter/CMakeLists.txt -@@ -26,7 +26,7 @@ - - ADD_EXECUTABLE(json_reformat ${SRCS}) - --TARGET_LINK_LIBRARIES(json_reformat yajl_s) -+TARGET_LINK_LIBRARIES(json_reformat yajl_s m) - - # copy the binary into the output directory - GET_TARGET_PROPERTY(binPath json_reformat LOCATION) diff --git a/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch b/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch index 261c486657..53decca649 100644 --- a/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch +++ b/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch @@ -1,8 +1,10 @@ -From bb4fb7ff71fd6cadd9c1bf8716845a91e5998c0c Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 31 Aug 2014 00:39:11 +0200 -Subject: [PATCH 2/2] cmake: disable shared library build when - BUILD_SHARED_LIBS is off +From b3cddf92adacfe5ca40574afb3e323cc7cdebc5c Mon Sep 17 00:00:00 2001 +From: Maxime Hadjinlian +Date: Tue, 2 Feb 2016 15:46:09 +0100 +Subject: [PATCH] cmake: Add shared library conditonnal build + +When BUILD_SHARED_LIBS is off, you don't want to build the shared +library. Signed-off-by: Samuel Martin --- @@ -10,7 +12,7 @@ Signed-off-by: Samuel Martin 1 file changed, 4 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e36b736..6a24424 100644 +index 99cf9e9..9e9c77d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,6 +37,7 @@ SET(LIBRARY_OUTPUT_PATH ${libDir}) @@ -29,16 +31,19 @@ index e36b736..6a24424 100644 #### build up an sdk as a post build step -@@ -78,7 +80,9 @@ INCLUDE_DIRECTORIES(${incDir}/..) - IF(NOT WIN32) - # at build time you may specify the cmake variable LIB_SUFFIX to handle - # 64-bit systems which use 'lib64' -+ IF(BUILD_SHARED_LIBS) - INSTALL(TARGETS yajl LIBRARY DESTINATION lib${LIB_SUFFIX}) -+ ENDIF(BUILD_SHARED_LIBS) - INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) - INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl) - INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl) +@@ -77,10 +79,12 @@ INCLUDE_DIRECTORIES(${incDir}/..) + + # at build time you may specify the cmake variable LIB_SUFFIX to handle + # 64-bit systems which use 'lib64' ++IF(BUILD_SHARED_LIBS) + INSTALL(TARGETS yajl + RUNTIME DESTINATION lib${LIB_SUFFIX} + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) ++ENDIF(BUILD_SHARED_LIBS) + INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl) + INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl) -- -2.1.0 +2.7.0 diff --git a/package/yajl/yajl.hash b/package/yajl/yajl.hash index 315d847db2..7b3abec922 100644 --- a/package/yajl/yajl.hash +++ b/package/yajl/yajl.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0e78f516dc53ecce7dc073f9a9bb0343186b58ef29dcd1dad74e5e853b216dd5 yajl-2.0.4.tar.gz +sha256 3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a yajl-2.1.0.tar.gz sha256 0f075b5f9a38bc02077370d4d57d12e615cfaaf7f634e3f2fc746b6582854e53 6d09f11b8fd358cab0e31b965327e64a599f9ce9.patch diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index 81f29e7265..7770e86aa7 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -4,7 +4,7 @@ # ################################################################################ -YAJL_VERSION = 2.0.4 +YAJL_VERSION = 2.1.0 YAJL_SITE = $(call github,lloyd,yajl,$(YAJL_VERSION)) YAJL_INSTALL_STAGING = YES YAJL_LICENSE = ISC From 8ffed8ae08d5b8b3a30fb3d00c9e3ad2b84c9b2e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 17 Feb 2016 10:00:46 -0300 Subject: [PATCH 032/206] musl: add fwrite regression patch As pointed in http://www.openwall.com/lists/musl/2016/02/17/3 add the fwrite regression patch for the recent 1.1.13 release. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...fputs-that-fwrite-returning-0-implie.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/musl/1.1.13/0001-fix-assumption-in-fputs-that-fwrite-returning-0-implie.patch diff --git a/package/musl/1.1.13/0001-fix-assumption-in-fputs-that-fwrite-returning-0-implie.patch b/package/musl/1.1.13/0001-fix-assumption-in-fputs-that-fwrite-returning-0-implie.patch new file mode 100644 index 0000000000..b32b7524ee --- /dev/null +++ b/package/musl/1.1.13/0001-fix-assumption-in-fputs-that-fwrite-returning-0-implie.patch @@ -0,0 +1,38 @@ +From 10a17dfbad2c267d885817abc9c7589fc7ff630b Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Tue, 16 Feb 2016 13:26:16 -0500 +Subject: [PATCH] fix assumption in fputs that fwrite returning 0 implies an + error + +internally, the idiom of passing nmemb=1 to fwrite and interpreting +the return value of fwrite (which is necessarily 0 or 1) as +failure/success is fairly widely used. this is not correct, however, +when the size argument is unknown and may be zero, since C requires +fwrite to return 0 in that special case. previously fwrite always +returned nmemb on success, but this was changed for conformance with +ISO C by commit 500c6886c654fd45e4926990fee2c61d816be197. + +Signed-off-by: Gustavo Zacarias +--- +Status: upstream. + + src/stdio/fputs.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/stdio/fputs.c b/src/stdio/fputs.c +index 4737f44..1cf344f 100644 +--- a/src/stdio/fputs.c ++++ b/src/stdio/fputs.c +@@ -3,7 +3,8 @@ + + int fputs(const char *restrict s, FILE *restrict f) + { +- return (int)fwrite(s, strlen(s), 1, f) - 1; ++ size_t l = strlen(s); ++ return (fwrite(s, 1, l, f)==l) - 1; + } + + weak_alias(fputs, fputs_unlocked); +-- +2.4.10 + From 443eceb9ba5e82bba0d898041af9361329a4ec2c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 17 Feb 2016 15:56:29 -0300 Subject: [PATCH 033/206] xterm: bump to version 322 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/xterm/xterm.hash | 2 +- package/xterm/xterm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index a6e2c69128..c9d06ebb8d 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 a60dbb574334c081425fa30f011cd9f571e3be7a91e2a84e252461798bce24a7 xterm-320.tgz +sha256 9adb41b53f76a3fccaa65d47a87d336094a523985d1d6a6b8cc468375ed109d6 xterm-322.tgz diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index 7cad0cbeef..0429685db0 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 320 +XTERM_VERSION = 322 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From 2eee4170bea5f9d42b2a0bb6f4e7f39f216c8f96 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 17 Feb 2016 16:11:39 -0300 Subject: [PATCH 034/206] usbredir: bump to version 0.7.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/usbredir/usbredir.hash | 2 +- package/usbredir/usbredir.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/usbredir/usbredir.hash b/package/usbredir/usbredir.hash index 8328bb59dd..9ba11771b4 100644 --- a/package/usbredir/usbredir.hash +++ b/package/usbredir/usbredir.hash @@ -1,2 +1,2 @@ # locally computed hash -sha256 028184960044ea4124030000b3c55a35c3238835116e3a0fbcaff449df2c8edf usbredir-0.6.tar.bz2 +sha256 407e9e27a1369f01264d5501ffbe88935ddd7d5de675f5835db05dc9c9ac56f3 usbredir-0.7.1.tar.bz2 diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk index dc87321bc3..926a1fffd5 100644 --- a/package/usbredir/usbredir.mk +++ b/package/usbredir/usbredir.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBREDIR_VERSION = 0.6 +USBREDIR_VERSION = 0.7.1 USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.bz2 USBREDIR_SITE = http://spice-space.org/download/usbredir USBREDIR_LICENSE = LGPLv2.1+ From eb570bb560da656f75f3aed1ac203f48381f846f Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Sat, 6 Feb 2016 23:59:47 +0100 Subject: [PATCH 035/206] python-characteristic: new package Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-characteristic/Config.in | 6 ++++++ .../python-characteristic.hash | 3 +++ .../python-characteristic/python-characteristic.mk | 14 ++++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 package/python-characteristic/Config.in create mode 100644 package/python-characteristic/python-characteristic.hash create mode 100644 package/python-characteristic/python-characteristic.mk diff --git a/package/Config.in b/package/Config.in index 21be9f6b16..edf06f1e8d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -626,6 +626,7 @@ menu "External python modules" source "package/python-cbor/Config.in" source "package/python-certifi/Config.in" source "package/python-cffi/Config.in" + source "package/python-characteristic/Config.in" source "package/python-cheetah/Config.in" source "package/python-cherrypy/Config.in" source "package/python-click/Config.in" diff --git a/package/python-characteristic/Config.in b/package/python-characteristic/Config.in new file mode 100644 index 0000000000..1226fa85e2 --- /dev/null +++ b/package/python-characteristic/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_CHARACTERISTIC + bool "python-characteristic" + help + Python attributes without boilerplate. + + https://pypi.python.org/pypi/characteristic diff --git a/package/python-characteristic/python-characteristic.hash b/package/python-characteristic/python-characteristic.hash new file mode 100644 index 0000000000..41dc18ccae --- /dev/null +++ b/package/python-characteristic/python-characteristic.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=b249368dd021fde1c06b4802867c0913, sha256 locally computed. +md5 b249368dd021fde1c06b4802867c0913 characteristic-14.3.0.tar.gz +sha256 ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380 characteristic-14.3.0.tar.gz diff --git a/package/python-characteristic/python-characteristic.mk b/package/python-characteristic/python-characteristic.mk new file mode 100644 index 0000000000..dc3e8bb299 --- /dev/null +++ b/package/python-characteristic/python-characteristic.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-characteristic +# +################################################################################ + +PYTHON_CHARACTERISTIC_VERSION = 14.3.0 +PYTHON_CHARACTERISTIC_SOURCE = characteristic-$(PYTHON_CHARACTERISTIC_VERSION).tar.gz +PYTHON_CHARACTERISTIC_SITE = http://pypi.python.org/packages/source/c/characteristic +PYTHON_CHARACTERISTIC_LICENSE = MIT +PYTHON_CHARACTERISTIC_LICENSE_FILES = LICENSE +PYTHON_CHARACTERISTIC_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 2fb2fb61b91bc8bf037b7d26cd294cd936e28543 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 18 Feb 2016 12:08:51 -0300 Subject: [PATCH 036/206] gvfs: bump to version 1.26.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gvfs/gvfs.hash | 4 ++-- package/gvfs/gvfs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index 19e820a506..5cc8857471 100644 --- a/package/gvfs/gvfs.hash +++ b/package/gvfs/gvfs.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.26/gvfs-1.26.2.sha256sum -sha256 695b6e0f3de5ac2cb4d188917edef3f13299328150a2413f1a7131d9b2d48d18 gvfs-1.26.2.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.26/gvfs-1.26.3.sha256sum +sha256 a70f75fa60d66f3f478c0c8aec43d0e43455a8cc75a4dfa8029e51c816401b4a gvfs-1.26.3.tar.xz diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index 48d2b506c0..f566fc7d5e 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -5,7 +5,7 @@ ################################################################################ GVFS_VERSION_MAJOR = 1.26 -GVFS_VERSION = $(GVFS_VERSION_MAJOR).2 +GVFS_VERSION = $(GVFS_VERSION_MAJOR).3 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) GVFS_INSTALL_STAGING = YES From d98aae3bca4f1ca8ebcabb025ed94a1bbb5cba72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 19 Feb 2016 09:01:10 +0100 Subject: [PATCH 037/206] package/libupnpp: bump to version 0.14.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/libupnpp/libupnpp.hash | 4 ++-- package/libupnpp/libupnpp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libupnpp/libupnpp.hash b/package/libupnpp/libupnpp.hash index a301fb3c07..685ccf4b86 100644 --- a/package/libupnpp/libupnpp.hash +++ b/package/libupnpp/libupnpp.hash @@ -1,2 +1,2 @@ -# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.13.1.tar.gz.sha256 -sha256 d4604e3e4875e99d0446a436f857a849d1e3dda59096861dcd6a0e6c16474cb7 libupnpp-0.13.1.tar.gz +# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.14.1.tar.gz.sha256 +sha256 ffb33379f3734419de683b0adca5228e802c64d3960681c15f3a8de7d7e315d1 libupnpp-0.14.1.tar.gz diff --git a/package/libupnpp/libupnpp.mk b/package/libupnpp/libupnpp.mk index 71ba311644..1525f8169b 100644 --- a/package/libupnpp/libupnpp.mk +++ b/package/libupnpp/libupnpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNPP_VERSION = 0.13.1 +LIBUPNPP_VERSION = 0.14.1 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBUPNPP_LICENSE = GPLv2+ LIBUPNPP_LICENSE_FILES = COPYING From 0ece8fd1bcade6134547c75a40c8020e1d7c4bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 19 Feb 2016 09:01:11 +0100 Subject: [PATCH 038/206] package/upmpdcli: bump to version 1.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit upmpdcli version 1.1.0 requires libupnpp version 0.14.1. Also adjust the installation of the config file. It is renamed to upmpdcli.conf-dist in the sources, but we install it as upmpdcli.conf as usual. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/upmpdcli/upmpdcli.hash | 4 ++-- package/upmpdcli/upmpdcli.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/upmpdcli/upmpdcli.hash b/package/upmpdcli/upmpdcli.hash index 5a6c47ae9a..07324a7afd 100644 --- a/package/upmpdcli/upmpdcli.hash +++ b/package/upmpdcli/upmpdcli.hash @@ -1,2 +1,2 @@ -# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-0.13.1.tar.gz.sha256 -sha256 86f964e49b0288a4d660aa4ad83576d83aad7c354df67d3aa8e324e8912876e0 upmpdcli-0.13.1.tar.gz +# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.1.0.tar.gz.sha256 +sha256 7193488091a204ed691d1f3ce3354e183c8245428a4a7ca8bd032e1a6c48520f upmpdcli-1.1.0.tar.gz diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index ba5bbb2bd4..6168595155 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPMPDCLI_VERSION = 0.13.1 +UPMPDCLI_VERSION = 1.1.0 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = GPLv2+ UPMPDCLI_LICENSE_FILES = COPYING @@ -40,7 +40,7 @@ define UPMPDCLI_INSTALL_INIT_SYSTEMD endef define UPMPDCLI_INSTALL_CONF_FILE - $(INSTALL) -D -m 0755 $(@D)/src/upmpdcli.conf $(TARGET_DIR)/etc/upmpdcli.conf + $(INSTALL) -D -m 0755 $(@D)/src/upmpdcli.conf-dist $(TARGET_DIR)/etc/upmpdcli.conf endef UPMPDCLI_POST_INSTALL_TARGET_HOOKS += UPMPDCLI_INSTALL_CONF_FILE From f3e49d7a453543a6ec266c158b174bf492660a0f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 19 Feb 2016 10:32:33 -0300 Subject: [PATCH 039/206] glibc: add version 2.23 Clarify the reason it's not available for sparc < v9. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/glibc/Config.in | 9 ++++++++- package/glibc/glibc.hash | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/glibc/Config.in b/package/glibc/Config.in index aeb236c597..d8f54b69b7 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -39,7 +39,13 @@ config BR2_GLIBC_VERSION_2_21 config BR2_GLIBC_VERSION_2_22 bool "2.22" - depends on !BR2_sparc # broken + # No support for pthread barriers on < v9 ISA + depends on !BR2_sparc + +config BR2_GLIBC_VERSION_2_23 + bool "2.23" + # No support for pthread barriers on < v9 ISA + depends on !BR2_sparc endchoice @@ -51,3 +57,4 @@ config BR2_GLIBC_VERSION_STRING default "2.19-svnr25243" if BR2_EGLIBC_VERSION_2_19 default "2.21" if BR2_GLIBC_VERSION_2_21 default "2.22" if BR2_GLIBC_VERSION_2_22 + default "2.23" if BR2_GLIBC_VERSION_2_23 diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 979202e43d..c8097357a5 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -6,3 +6,4 @@ md5 197836c2ba42fb146e971222647198dd eglibc-2.19-svnr25243.tar.bz2 sha1 8013c1935b46fd50d2d1fbfad3b0af362b75fb28 eglibc-2.19-svnr25243.tar.bz2 sha256 aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8 glibc-2.21.tar.xz sha256 eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948 glibc-2.22.tar.xz +sha256 94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 glibc-2.23.tar.xz From 35e19d4f3fd3d40acdbe6fc2cdac7abf13aedb08 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 19 Feb 2016 10:32:34 -0300 Subject: [PATCH 040/206] glibc: bump default to version 2.22 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/glibc/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/glibc/Config.in b/package/glibc/Config.in index d8f54b69b7..f839e29269 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -32,7 +32,7 @@ config BR2_PACKAGE_GLIBC choice prompt "glibc version" - default BR2_GLIBC_VERSION_2_21 + default BR2_GLIBC_VERSION_2_22 config BR2_GLIBC_VERSION_2_21 bool "2.21" From f699fab4ee178111b7f2870af1461e7dc9e29c04 Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Sat, 6 Feb 2016 23:59:48 +0100 Subject: [PATCH 041/206] python-pycparser: python runtime added Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-pycparser/Config.in | 6 ++++++ package/python-pycparser/python-pycparser.mk | 1 + 3 files changed, 8 insertions(+) create mode 100644 package/python-pycparser/Config.in diff --git a/package/Config.in b/package/Config.in index edf06f1e8d..9199aea13c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -680,6 +680,7 @@ menu "External python modules" source "package/python-psutil/Config.in" source "package/python-pyasn/Config.in" source "package/python-pycli/Config.in" + source "package/python-pycparser/Config.in" source "package/python-pycrypto/Config.in" source "package/python-pydal/Config.in" source "package/python-pyftpdlib/Config.in" diff --git a/package/python-pycparser/Config.in b/package/python-pycparser/Config.in new file mode 100644 index 0000000000..49190c3405 --- /dev/null +++ b/package/python-pycparser/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYCPARSER + bool "python-pycparser" + help + C parser in Python + + https://github.com/eliben/pycparser diff --git a/package/python-pycparser/python-pycparser.mk b/package/python-pycparser/python-pycparser.mk index 328bc8a13c..a32f1aa2a4 100644 --- a/package/python-pycparser/python-pycparser.mk +++ b/package/python-pycparser/python-pycparser.mk @@ -11,4 +11,5 @@ PYTHON_PYCPARSER_SETUP_TYPE = setuptools PYTHON_PYCPARSER_LICENSE = BSD-3c PYTHON_PYCPARSER_LICENSE_FILES = LICENSE +$(eval $(python-package)) $(eval $(host-python-package)) From 0a19359bf8218646f7b08b34f18896364e40c2ee Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Sat, 6 Feb 2016 23:59:49 +0100 Subject: [PATCH 042/206] python-lmdb: new package Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov [Thomas: - switch to Github, which has a LICENSE file. The issue was reported upstream: https://github.com/dw/py-lmdb/issues/108. Then added the _LICENSE_FILES variable. - bump version to 0.89 (instead of 0.88) - indicate the proper license, following the SPDX code for the OpenLDAP 2.8 license.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-lmdb/Config.in | 7 +++++++ package/python-lmdb/python-lmdb.hash | 2 ++ package/python-lmdb/python-lmdb.mk | 14 ++++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 package/python-lmdb/Config.in create mode 100644 package/python-lmdb/python-lmdb.hash create mode 100644 package/python-lmdb/python-lmdb.mk diff --git a/package/Config.in b/package/Config.in index 9199aea13c..b69a481515 100644 --- a/package/Config.in +++ b/package/Config.in @@ -659,6 +659,7 @@ menu "External python modules" source "package/python-json-schema-validator/Config.in" source "package/python-keyring/Config.in" source "package/python-libconfig/Config.in" + source "package/python-lmdb/Config.in" source "package/python-lxml/Config.in" source "package/python-mad/Config.in" source "package/python-mako/Config.in" diff --git a/package/python-lmdb/Config.in b/package/python-lmdb/Config.in new file mode 100644 index 0000000000..baf9bce5ac --- /dev/null +++ b/package/python-lmdb/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_LMDB + bool "python-lmdb" + select BR2_PACKAGE_PYTHON_CFFI # runtime + help + Universal Python binding for the LMDB 'Lightning' Database. + + https://pypi.python.org/pypi/lmdb diff --git a/package/python-lmdb/python-lmdb.hash b/package/python-lmdb/python-lmdb.hash new file mode 100644 index 0000000000..7c2946044d --- /dev/null +++ b/package/python-lmdb/python-lmdb.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 abd2b2ae9ecf2fd1e1bc55ef4e8463b5910722fcd70a1bbf34a3e669a74a41a4 python-lmdb-py-lmdb_0.89.tar.gz diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk new file mode 100644 index 0000000000..62fb0465b1 --- /dev/null +++ b/package/python-lmdb/python-lmdb.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-lmdb +# +################################################################################ + +PYTHON_LMDB_VERSION = py-lmdb_0.89 +PYTHON_LMDB_SITE = $(call github,dw,py-lmdb,$(PYTHON_LMDB_VERSION)) +PYTHON_LMDB_LICENSE = OLDAP-2.8 +PYTHON_LMDB_LICENSE_FILES = LICENSE +PYTHON_LMDB_SETUP_TYPE = setuptools +PYTHON_LMDB_DEPENDENCIES = host-python-cffi + +$(eval $(python-package)) From f17c345d9df90a1661816392a97ab18bde751f01 Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Sat, 6 Feb 2016 23:59:50 +0100 Subject: [PATCH 043/206] python-pygments: new package Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-pygments/Config.in | 6 ++++++ package/python-pygments/python-pygments.hash | 3 +++ package/python-pygments/python-pygments.mk | 14 ++++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 package/python-pygments/Config.in create mode 100644 package/python-pygments/python-pygments.hash create mode 100644 package/python-pygments/python-pygments.mk diff --git a/package/Config.in b/package/Config.in index b69a481515..ca3d0636d9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -686,6 +686,7 @@ menu "External python modules" source "package/python-pydal/Config.in" source "package/python-pyftpdlib/Config.in" source "package/python-pygame/Config.in" + source "package/python-pygments/Config.in" source "package/python-pyinotify/Config.in" source "package/python-pyparsing/Config.in" source "package/python-pyparted/Config.in" diff --git a/package/python-pygments/Config.in b/package/python-pygments/Config.in new file mode 100644 index 0000000000..f097c52397 --- /dev/null +++ b/package/python-pygments/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYGMENTS + bool "python-pygments" + help + Pygments is a syntax highlighting package written in Python. + + https://pypi.python.org/pypi/Pygments diff --git a/package/python-pygments/python-pygments.hash b/package/python-pygments/python-pygments.hash new file mode 100644 index 0000000000..bb954dd551 --- /dev/null +++ b/package/python-pygments/python-pygments.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=84533d22f72de894f6d3907c3ca9eddf, sha256 locally computed. +md5 84533d22f72de894f6d3907c3ca9eddf Pygments-2.1.tar.gz +sha256 13a0ef5fafd7b16cf995bc28fe7aab0780dab1b2fda0fc89e033709af8b8a47b Pygments-2.1.tar.gz diff --git a/package/python-pygments/python-pygments.mk b/package/python-pygments/python-pygments.mk new file mode 100644 index 0000000000..eafd77590b --- /dev/null +++ b/package/python-pygments/python-pygments.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pygments +# +################################################################################ + +PYTHON_PYGMENTS_VERSION = 2.1 +PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz +PYTHON_PYGMENTS_SITE = http://pypi.python.org/packages/source/P/Pygments +PYTHON_PYGMENTS_LICENSE = BSD-2c +PYTHON_PYGMENTS_LICENSE_FILES = LICENSE +PYTHON_PYGMENTS_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 3116fd4797d5dc63c5529a4cd2f85e51adfbfc66 Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Sat, 6 Feb 2016 23:59:52 +0100 Subject: [PATCH 044/206] python-pytrie: new package Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-pytrie/Config.in | 6 ++++++ package/python-pytrie/python-pytrie.hash | 3 +++ package/python-pytrie/python-pytrie.mk | 14 ++++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 package/python-pytrie/Config.in create mode 100644 package/python-pytrie/python-pytrie.hash create mode 100644 package/python-pytrie/python-pytrie.mk diff --git a/package/Config.in b/package/Config.in index ca3d0636d9..32bf4ddba3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -700,6 +700,7 @@ menu "External python modules" source "package/python-pysnmp/Config.in" source "package/python-pysnmp-apps/Config.in" source "package/python-pysnmp-mibs/Config.in" + source "package/python-pytrie/Config.in" source "package/python-pyudev/Config.in" source "package/python-pyusb/Config.in" source "package/python-pyxb/Config.in" diff --git a/package/python-pytrie/Config.in b/package/python-pytrie/Config.in new file mode 100644 index 0000000000..fb1df41d0a --- /dev/null +++ b/package/python-pytrie/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYTRIE + bool "python-pytrie" + help + A pure Python implementation of the trie data structure. + + https://pypi.python.org/pypi/PyTrie diff --git a/package/python-pytrie/python-pytrie.hash b/package/python-pytrie/python-pytrie.hash new file mode 100644 index 0000000000..88d2542a8d --- /dev/null +++ b/package/python-pytrie/python-pytrie.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=5997b46c854a68bc588f4527c987663a, sha256 locally computed. +md5 5997b46c854a68bc588f4527c987663a PyTrie-0.2.tar.gz +sha256 b272021351efadc6757591aac03ed4794bdfd091122204a4673e94bfb66cc500 PyTrie-0.2.tar.gz diff --git a/package/python-pytrie/python-pytrie.mk b/package/python-pytrie/python-pytrie.mk new file mode 100644 index 0000000000..e3bea4f690 --- /dev/null +++ b/package/python-pytrie/python-pytrie.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pytrie +# +################################################################################ + +PYTHON_PYTRIE_VERSION = 0.2 +PYTHON_PYTRIE_SITE = http://pypi.python.org/packages/source/P/PyTrie +PYTHON_PYTRIE_SOURCE = PyTrie-$(PYTHON_PYTRIE_VERSION).tar.gz +PYTHON_PYTRIE_LICENSE = BSD-3c +PYTHON_PYTRIE_LICENSE_FILES = LICENSE +PYTHON_PYTRIE_SETUP_TYPE = distutils + +$(eval $(python-package)) From 96a7a3cb7688ff67f02d45f0002c638ee5faadb6 Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Sat, 6 Feb 2016 23:59:54 +0100 Subject: [PATCH 045/206] python-shutilwhich: new package Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov [Thomas: fix license, it's not MIT, but PSF.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-shutilwhich/Config.in | 7 +++++++ package/python-shutilwhich/python-shutilwhich.hash | 3 +++ package/python-shutilwhich/python-shutilwhich.mk | 13 +++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 package/python-shutilwhich/Config.in create mode 100644 package/python-shutilwhich/python-shutilwhich.hash create mode 100644 package/python-shutilwhich/python-shutilwhich.mk diff --git a/package/Config.in b/package/Config.in index 32bf4ddba3..ce71f3cf9b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -710,6 +710,7 @@ menu "External python modules" source "package/python-rtslib-fb/Config.in" source "package/python-serial/Config.in" source "package/python-setuptools/Config.in" + source "package/python-shutilwhich/Config.in" source "package/python-simplejson/Config.in" source "package/python-singledispatch/Config.in" source "package/python-sip/Config.in" diff --git a/package/python-shutilwhich/Config.in b/package/python-shutilwhich/Config.in new file mode 100644 index 0000000000..abdc8d77a1 --- /dev/null +++ b/package/python-shutilwhich/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_SHUTILWHICH + bool "python-shutilwhich" + depends on BR2_PACKAGE_PYTHON + help + shutil.which for those not using Python 3.3 yet. + + https://pypi.python.org/pypi/shutilwhich/ diff --git a/package/python-shutilwhich/python-shutilwhich.hash b/package/python-shutilwhich/python-shutilwhich.hash new file mode 100644 index 0000000000..b1a2c7854f --- /dev/null +++ b/package/python-shutilwhich/python-shutilwhich.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=915947c5cdae7afd748ac715ee547adb, sha256 locally computed. +md5 915947c5cdae7afd748ac715ee547adb shutilwhich-1.1.0.tar.gz +sha256 db1f39c6461e42f630fa617bb8c79090f7711c9ca493e615e43d0610ecb64dc6 shutilwhich-1.1.0.tar.gz diff --git a/package/python-shutilwhich/python-shutilwhich.mk b/package/python-shutilwhich/python-shutilwhich.mk new file mode 100644 index 0000000000..0497e1b6d0 --- /dev/null +++ b/package/python-shutilwhich/python-shutilwhich.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-shutilwhich +# +################################################################################ + +PYTHON_SHUTILWHICH_VERSION = 1.1.0 +PYTHON_SHUTILWHICH_SOURCE = shutilwhich-$(PYTHON_SHUTILWHICH_VERSION).tar.gz +PYTHON_SHUTILWHICH_SITE = http://pypi.python.org/packages/source/s/shutilwhich +PYTHON_SHUTILWHICH_LICENSE = Python Software Foundation License +PYTHON_SHUTILWHICH_SETUP_TYPE = setuptools + +$(eval $(python-package)) From fbeeb4c8cb4e44c654ca27db9ae05a83202f4104 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 8 Feb 2016 10:04:21 +0100 Subject: [PATCH 046/206] python-cryptography: new package Signed-off-by: Yegor Yefremov [Thomas: - fix license information: it is either Apache-2.0 *or* BSD-3c - add the LICENSE file to the list of license files, since it is the one that explains that the license is either Apache-2.0 or BSD-3c.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-cryptography/Config.in | 23 +++++++++++++++++++ .../python-cryptography.hash | 3 +++ .../python-cryptography.mk | 15 ++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 package/python-cryptography/Config.in create mode 100644 package/python-cryptography/python-cryptography.hash create mode 100644 package/python-cryptography/python-cryptography.mk diff --git a/package/Config.in b/package/Config.in index ce71f3cf9b..c92e925774 100644 --- a/package/Config.in +++ b/package/Config.in @@ -634,6 +634,7 @@ menu "External python modules" source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" source "package/python-crc16/Config.in" + source "package/python-cryptography/Config.in" source "package/python-cssselect/Config.in" source "package/python-daemon/Config.in" source "package/python-dialog/Config.in" diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in new file mode 100644 index 0000000000..9827cf82b6 --- /dev/null +++ b/package/python-cryptography/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY + bool "python-cryptography" + depends on BR2_INSTALL_LIBSTDCPP # python-pyasn + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_PYTHON_CFFI # runtime + select BR2_PACKAGE_PYTHON_IDNA # runtime + select BR2_PACKAGE_PYTHON_PYASN # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime + help + cryptography is a package designed to expose cryptographic + primitives and recipes to Python developers. + + https://cryptography.io + +comment "python-cryptography needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash new file mode 100644 index 0000000000..b35f801b2c --- /dev/null +++ b/package/python-cryptography/python-cryptography.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=2b25eebd1d3c6bae52b46f0dcec74dfb, sha256 locally computed +md5 2b25eebd1d3c6bae52b46f0dcec74dfb cryptography-1.2.2.tar.gz +sha256 3f219cb9106d9b737ea9c332c4d15d70ac328f91b59fd9d79f78bdea8f826a67 cryptography-1.2.2.tar.gz diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk new file mode 100644 index 0000000000..cefd3cba34 --- /dev/null +++ b/package/python-cryptography/python-cryptography.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-cryptography +# +################################################################################ + +PYTHON_CRYPTOGRAPHY_VERSION = 1.2.2 +PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz +PYTHON_CRYPTOGRAPHY_SITE = https://pypi.python.org/packages/source/c/cryptography +PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools +PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3c +PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD +PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl + +$(eval $(python-package)) From 9d552c1997006bf476533e9e3d115441c57895f5 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 8 Feb 2016 10:04:22 +0100 Subject: [PATCH 047/206] python-pyopenssl: new package Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-pyopenssl/Config.in | 12 ++++++++++++ package/python-pyopenssl/python-pyopenssl.hash | 3 +++ package/python-pyopenssl/python-pyopenssl.mk | 14 ++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 package/python-pyopenssl/Config.in create mode 100644 package/python-pyopenssl/python-pyopenssl.hash create mode 100644 package/python-pyopenssl/python-pyopenssl.mk diff --git a/package/Config.in b/package/Config.in index c92e925774..8637096f5a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -689,6 +689,7 @@ menu "External python modules" source "package/python-pygame/Config.in" source "package/python-pygments/Config.in" source "package/python-pyinotify/Config.in" + source "package/python-pyopenssl/Config.in" source "package/python-pyparsing/Config.in" source "package/python-pyparted/Config.in" source "package/python-pypcap/Config.in" diff --git a/package/python-pyopenssl/Config.in b/package/python-pyopenssl/Config.in new file mode 100644 index 0000000000..c32e211e17 --- /dev/null +++ b/package/python-pyopenssl/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_PYOPENSSL + bool "python-pyopenssl" + depends on BR2_INSTALL_LIBSTDCPP # python-cryptography + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Python wrapper module around the OpenSSL library. + + https://github.com/pyca/pyopenssl + +comment "python-pyopenssl needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-pyopenssl/python-pyopenssl.hash b/package/python-pyopenssl/python-pyopenssl.hash new file mode 100644 index 0000000000..0c6e25a6ac --- /dev/null +++ b/package/python-pyopenssl/python-pyopenssl.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f447644afcbd5f0a1f47350fec63a4c6, sha256 locally computed +md5 f447644afcbd5f0a1f47350fec63a4c6 pyOpenSSL-0.15.1.tar.gz +sha256 f0a26070d6db0881de8bcc7846934b7c3c930d8f9c79d45883ee48984bc0d672 pyOpenSSL-0.15.1.tar.gz diff --git a/package/python-pyopenssl/python-pyopenssl.mk b/package/python-pyopenssl/python-pyopenssl.mk new file mode 100644 index 0000000000..239fd98012 --- /dev/null +++ b/package/python-pyopenssl/python-pyopenssl.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyopenssl +# +################################################################################ + +PYTHON_PYOPENSSL_VERSION = 0.15.1 +PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz +PYTHON_PYOPENSSL_SITE = https://pypi.python.org/packages/source/p/pyOpenSSL +PYTHON_PYOPENSSL_LICENSE = Apache-2.0 +PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE +PYTHON_PYOPENSSL_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 4753063e2861659260e1d6927eb66ea96c98c9e6 Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Thu, 11 Feb 2016 11:58:46 +0100 Subject: [PATCH 048/206] python-service-identity: new package Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-service-identity/Config.in | 10 ++++++++++ .../python-service-identity.hash | 3 +++ .../python-service-identity.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-service-identity/Config.in create mode 100644 package/python-service-identity/python-service-identity.hash create mode 100644 package/python-service-identity/python-service-identity.mk diff --git a/package/Config.in b/package/Config.in index 8637096f5a..d9da232faf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -711,6 +711,7 @@ menu "External python modules" source "package/python-requests/Config.in" source "package/python-rtslib-fb/Config.in" source "package/python-serial/Config.in" + source "package/python-service-identity/Config.in" source "package/python-setuptools/Config.in" source "package/python-shutilwhich/Config.in" source "package/python-simplejson/Config.in" diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in new file mode 100644 index 0000000000..e2200f67a8 --- /dev/null +++ b/package/python-service-identity/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY + bool "python-service-identity" + select BR2_PACKAGE_PYTHON_CHARACTERISTIC # runtime + select BR2_PACKAGE_PYTHON_PYASN # runtime + select BR2_PACKAGE_PYTHON_PYASN_MODULES # runtime + select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime + help + Service identity verification for pyOpenSSL. + + https://pypi.python.org/pypi/service_identity diff --git a/package/python-service-identity/python-service-identity.hash b/package/python-service-identity/python-service-identity.hash new file mode 100644 index 0000000000..caf29dc462 --- /dev/null +++ b/package/python-service-identity/python-service-identity.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=cea0b0156d73b025ecef660fb51f0d9a, sha256 locally computed. +md5 cea0b0156d73b025ecef660fb51f0d9a service_identity-14.0.0.tar.gz +sha256 3105a319a7c558490666694f599be0c377ad54824eefb404cde4ce49e74a4f5a service_identity-14.0.0.tar.gz diff --git a/package/python-service-identity/python-service-identity.mk b/package/python-service-identity/python-service-identity.mk new file mode 100644 index 0000000000..9eca3c1da0 --- /dev/null +++ b/package/python-service-identity/python-service-identity.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-service-identity +# +################################################################################ + +PYTHON_SERVICE_IDENTITY_VERSION = 14.0.0 +PYTHON_SERVICE_IDENTITY_SOURCE = service_identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz +PYTHON_SERVICE_IDENTITY_SITE = http://pypi.python.org/packages/source/s/service_identity +PYTHON_SERVICE_IDENTITY_LICENSE = MIT +PYTHON_SERVICE_IDENTITY_LICENSE_FILES = LICENSE +PYTHON_SERVICE_IDENTITY_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 357b945957dacec8a0bf3aa425d9b40f45f5a487 Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Sat, 6 Feb 2016 23:59:55 +0100 Subject: [PATCH 049/206] python-treq: new package Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov [Thomas: rewrap Config.in help text.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-treq/Config.in | 13 +++++++++++++ package/python-treq/python-treq.hash | 3 +++ package/python-treq/python-treq.mk | 14 ++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/python-treq/Config.in create mode 100644 package/python-treq/python-treq.hash create mode 100644 package/python-treq/python-treq.mk diff --git a/package/Config.in b/package/Config.in index d9da232faf..7a88d5b3be 100644 --- a/package/Config.in +++ b/package/Config.in @@ -722,6 +722,7 @@ menu "External python modules" source "package/python-spidev/Config.in" source "package/python-thrift/Config.in" source "package/python-tornado/Config.in" + source "package/python-treq/Config.in" source "package/python-twisted/Config.in" source "package/python-urllib3/Config.in" source "package/python-urwid/Config.in" diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in new file mode 100644 index 0000000000..a8590a9740 --- /dev/null +++ b/package/python-treq/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_TREQ + bool "python-treq" + select BR2_PACKAGE_PYTHON_REQUESTS # runtime + select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_TWISTED # runtime + select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime + help + treq is an HTTP library inspired by requests but written on + top of Twisted's Agents. It provides a simple, higher level + API for making HTTP requests when using Twisted. + + https://github.com/twisted/treq diff --git a/package/python-treq/python-treq.hash b/package/python-treq/python-treq.hash new file mode 100644 index 0000000000..f4cc4d6f11 --- /dev/null +++ b/package/python-treq/python-treq.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=b1fb60759ad5a885cb8ea562553f2d4c, sha256 locally computed +md5 b1fb60759ad5a885cb8ea562553f2d4c treq-15.1.0.tar.gz +sha256 425a47d5d52a993d51211028fb6ade252e5fbea094e878bb4b644096a7322de8 treq-15.1.0.tar.gz diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk new file mode 100644 index 0000000000..dbf0e148a7 --- /dev/null +++ b/package/python-treq/python-treq.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-treq +# +################################################################################ + +PYTHON_TREQ_VERSION = 15.1.0 +PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz +PYTHON_TREQ_SITE = http://pypi.python.org/packages/source/t/treq +PYTHON_TREQ_LICENSE = MIT +PYTHON_TREQ_LICENSE_FILES = LICENSE +PYTHON_TREQ_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 148d964e4dd66397b3bc14f5aca4321d6c409d35 Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Sat, 6 Feb 2016 23:59:56 +0100 Subject: [PATCH 050/206] python-txaio: new package Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-txaio/Config.in | 7 +++++++ package/python-txaio/python-txaio.hash | 3 +++ package/python-txaio/python-txaio.mk | 14 ++++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 package/python-txaio/Config.in create mode 100644 package/python-txaio/python-txaio.hash create mode 100644 package/python-txaio/python-txaio.mk diff --git a/package/Config.in b/package/Config.in index 7a88d5b3be..209814135d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -724,6 +724,7 @@ menu "External python modules" source "package/python-tornado/Config.in" source "package/python-treq/Config.in" source "package/python-twisted/Config.in" + source "package/python-txaio/Config.in" source "package/python-urllib3/Config.in" source "package/python-urwid/Config.in" source "package/python-versiontools/Config.in" diff --git a/package/python-txaio/Config.in b/package/python-txaio/Config.in new file mode 100644 index 0000000000..9d4238215e --- /dev/null +++ b/package/python-txaio/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_TXAIO + bool "python-txaio" + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Compatibility API between asyncio/Twisted/Trollius. + + https://pypi.python.org/pypi/txaio diff --git a/package/python-txaio/python-txaio.hash b/package/python-txaio/python-txaio.hash new file mode 100644 index 0000000000..5d9e6cf097 --- /dev/null +++ b/package/python-txaio/python-txaio.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=c2a7e6ebfdf8987c3938e40e39a3c5e7, sha256 locally computed +md5 c2a7e6ebfdf8987c3938e40e39a3c5e7 txaio-2.2.1.tar.gz +sha256 6eee00c397d8193d15313dfc36da3eac8d64edf0b92fe3b67cd5a735ffc3074b txaio-2.2.1.tar.gz diff --git a/package/python-txaio/python-txaio.mk b/package/python-txaio/python-txaio.mk new file mode 100644 index 0000000000..127bc62770 --- /dev/null +++ b/package/python-txaio/python-txaio.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-txaio +# +################################################################################ + +PYTHON_TXAIO_VERSION = 2.2.1 +PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz +PYTHON_TXAIO_SITE = http://pypi.python.org/packages/source/t/txaio +PYTHON_TXAIO_LICENSE = MIT +PYTHON_TXAIO_LICENSE_FILES = LICENSE +PYTHON_TXAIO_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 688793a19579b563d451b574e5924466445163ae Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Sat, 6 Feb 2016 23:59:57 +0100 Subject: [PATCH 051/206] python-pyasn-modules: new package Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-pyasn-modules/Config.in | 11 +++++++++++ .../python-pyasn-modules/python-pyasn-modules.hash | 3 +++ .../python-pyasn-modules/python-pyasn-modules.mk | 14 ++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-pyasn-modules/Config.in create mode 100644 package/python-pyasn-modules/python-pyasn-modules.hash create mode 100644 package/python-pyasn-modules/python-pyasn-modules.mk diff --git a/package/Config.in b/package/Config.in index 209814135d..11ba42d5d5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -681,6 +681,7 @@ menu "External python modules" source "package/python-protobuf/Config.in" source "package/python-psutil/Config.in" source "package/python-pyasn/Config.in" + source "package/python-pyasn-modules/Config.in" source "package/python-pycli/Config.in" source "package/python-pycparser/Config.in" source "package/python-pycrypto/Config.in" diff --git a/package/python-pyasn-modules/Config.in b/package/python-pyasn-modules/Config.in new file mode 100644 index 0000000000..387020d9d6 --- /dev/null +++ b/package/python-pyasn-modules/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_PYASN_MODULES + bool "python-pyasn-modules" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_PYASN # runtime + help + A collection of ASN.1-based protocols modules. + + https://pypi.python.org/pypi/pyasn1-modules + +comment "python-pyasn-modules needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-pyasn-modules/python-pyasn-modules.hash b/package/python-pyasn-modules/python-pyasn-modules.hash new file mode 100644 index 0000000000..6d9a707931 --- /dev/null +++ b/package/python-pyasn-modules/python-pyasn-modules.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=178129bc7fbf07215c25230c5f053f81, sha256 locally computed. +md5 178129bc7fbf07215c25230c5f053f81 pyasn1-modules-0.0.8.tar.gz +sha256 10561934f1829bcc455c7ecdcdacdb4be5ffd3696f26f468eb6eb41e107f3837 pyasn1-modules-0.0.8.tar.gz diff --git a/package/python-pyasn-modules/python-pyasn-modules.mk b/package/python-pyasn-modules/python-pyasn-modules.mk new file mode 100644 index 0000000000..bb32227a20 --- /dev/null +++ b/package/python-pyasn-modules/python-pyasn-modules.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyasn-modules +# +################################################################################ + +PYTHON_PYASN_MODULES_VERSION = 0.0.8 +PYTHON_PYASN_MODULES_SOURCE = pyasn1-modules-$(PYTHON_PYASN_MODULES_VERSION).tar.gz +PYTHON_PYASN_MODULES_SITE = http://pypi.python.org/packages/source/p/pyasn1-modules +PYTHON_PYASN_MODULES_LICENSE = BSD-2c +PYTHON_PYASN_MODULES_LICENSE_FILES = LICENSE.txt +PYTHON_PYASN_MODULES_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 61c056d40bc51f99f8be19b7e77894a5e6565fd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 19 Feb 2016 08:48:56 +0100 Subject: [PATCH 052/206] package/avahi: bump to version 0.6.32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also: * switch download site to github as the previous download page is not maintained anymore * drop 0004-no-gtk-deprecations.patch as it is applied upstream Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/avahi/0004-no-gtk-deprecations.patch | 30 -------------------- package/avahi/avahi.hash | 2 +- package/avahi/avahi.mk | 4 +-- 3 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 package/avahi/0004-no-gtk-deprecations.patch diff --git a/package/avahi/0004-no-gtk-deprecations.patch b/package/avahi/0004-no-gtk-deprecations.patch deleted file mode 100644 index d187053cf0..0000000000 --- a/package/avahi/0004-no-gtk-deprecations.patch +++ /dev/null @@ -1,30 +0,0 @@ -Patch from http://pkgs.fedoraproject.org/cgit/avahi.git/plain/avahi-0.6.31-no-deprecations.patch?id=b3f4de05e331258c5123e3acc144e452595c2112 - -Don't disable deprecated GTK support, as that breaks builds with modern GTK3 -versions. - -For more details, see the Fedora bugzilla: -https://bugzilla.redhat.com/show_bug.cgi?id=1001676 - -[Peter: patch Makefile.in so we don't need autoreconf] -Signed-off-by: Peter Korsgaard ---- - avahi-ui/Makefile.am | 2 +- - avahi-ui/Makefile.in | 3 +-- - configure.ac | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -Index: avahi-0.6.31/avahi-ui/Makefile.in -=================================================================== ---- avahi-0.6.31.orig/avahi-ui/Makefile.in -+++ avahi-0.6.31/avahi-ui/Makefile.in -@@ -464,8 +464,7 @@ - top_srcdir = @top_srcdir@ - - # This cool debug trap works on i386/gcc only --AM_CFLAGS = -I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 \ -- -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1 \ -+AM_CFLAGS = -I$(top_srcdir) \ - '-DDEBUG_TRAP=__asm__("int $$3")' $(am__append_1) - pkglibdatadir = $(libdir)/avahi - desktopdir = $(datadir)/applications diff --git a/package/avahi/avahi.hash b/package/avahi/avahi.hash index 99bbd513cc..09c5d42433 100644 --- a/package/avahi/avahi.hash +++ b/package/avahi/avahi.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 avahi-0.6.31.tar.gz +sha256 d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454 avahi-0.6.32.tar.gz diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 5d6e6a811f..cad7acd302 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -11,8 +11,8 @@ # either version 2.1 of the License, or (at your option) any # later version. -AVAHI_VERSION = 0.6.31 -AVAHI_SITE = http://www.avahi.org/download +AVAHI_VERSION = 0.6.32 +AVAHI_SITE = https://github.com/lathiat/avahi/releases/download/v$(AVAHI_VERSION) AVAHI_LICENSE = LGPLv2.1+ AVAHI_LICENSE_FILES = LICENSE AVAHI_INSTALL_STAGING = YES From 0226a0af0f19a90d822cd01e9720cdc20cc771f8 Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Sat, 6 Feb 2016 23:59:59 +0100 Subject: [PATCH 053/206] python-ujson: new package Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-ujson/Config.in | 7 +++++++ package/python-ujson/python-ujson.hash | 3 +++ package/python-ujson/python-ujson.mk | 13 +++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 package/python-ujson/Config.in create mode 100644 package/python-ujson/python-ujson.hash create mode 100644 package/python-ujson/python-ujson.mk diff --git a/package/Config.in b/package/Config.in index 11ba42d5d5..ce15775d57 100644 --- a/package/Config.in +++ b/package/Config.in @@ -726,6 +726,7 @@ menu "External python modules" source "package/python-treq/Config.in" source "package/python-twisted/Config.in" source "package/python-txaio/Config.in" + source "package/python-ujson/Config.in" source "package/python-urllib3/Config.in" source "package/python-urwid/Config.in" source "package/python-versiontools/Config.in" diff --git a/package/python-ujson/Config.in b/package/python-ujson/Config.in new file mode 100644 index 0000000000..d185c98532 --- /dev/null +++ b/package/python-ujson/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_UJSON + bool "python-ujson" + help + UltraJSON is an ultra fast JSON encoder and decoder written + in pure C with bindings for Python 2.5+ and 3. + + https://pypi.python.org/pypi/ujson diff --git a/package/python-ujson/python-ujson.hash b/package/python-ujson/python-ujson.hash new file mode 100644 index 0000000000..21320346a1 --- /dev/null +++ b/package/python-ujson/python-ujson.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=42f77b0cce686dfa4da2e68480b1dd24,sha256 locally computed. +md5 42f77b0cce686dfa4da2e68480b1dd24 ujson-1.35.tar.gz +sha256 f66073e5506e91d204ab0c614a148d5aa938bdbf104751be66f8ad7a222f5f86 ujson-1.35.tar.gz diff --git a/package/python-ujson/python-ujson.mk b/package/python-ujson/python-ujson.mk new file mode 100644 index 0000000000..8d4a12b811 --- /dev/null +++ b/package/python-ujson/python-ujson.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-ujson +# +################################################################################ + +PYTHON_UJSON_VERSION = 1.35 +PYTHON_UJSON_SOURCE = ujson-$(PYTHON_UJSON_VERSION).tar.gz +PYTHON_UJSON_SITE = http://pypi.python.org/packages/source/u/ujson +PYTHON_UJSON_LICENSE = BSD-3c +PYTHON_UJSON_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 4a7d79e99430bb9d03c9196761cd67c575db8304 Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Sun, 7 Feb 2016 00:00:01 +0100 Subject: [PATCH 054/206] python-setproctitle: new package Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-setproctitle/Config.in | 6 ++++++ .../python-setproctitle/python-setproctitle.hash | 3 +++ package/python-setproctitle/python-setproctitle.mk | 14 ++++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 package/python-setproctitle/Config.in create mode 100644 package/python-setproctitle/python-setproctitle.hash create mode 100644 package/python-setproctitle/python-setproctitle.mk diff --git a/package/Config.in b/package/Config.in index ce15775d57..486228009f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -713,6 +713,7 @@ menu "External python modules" source "package/python-rtslib-fb/Config.in" source "package/python-serial/Config.in" source "package/python-service-identity/Config.in" + source "package/python-setproctitle/Config.in" source "package/python-setuptools/Config.in" source "package/python-shutilwhich/Config.in" source "package/python-simplejson/Config.in" diff --git a/package/python-setproctitle/Config.in b/package/python-setproctitle/Config.in new file mode 100644 index 0000000000..d13afaa401 --- /dev/null +++ b/package/python-setproctitle/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_SETPROCTITLE + bool "python-setproctitle" + help + A Python module to customize the process title. + + https://pypi.python.org/pypi/setproctitle diff --git a/package/python-setproctitle/python-setproctitle.hash b/package/python-setproctitle/python-setproctitle.hash new file mode 100644 index 0000000000..3b0fd71c3a --- /dev/null +++ b/package/python-setproctitle/python-setproctitle.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=95d9e56c69437246460a20804961d70d, sha256 locally computed. +md5 95d9e56c69437246460a20804961d70d setproctitle-1.1.9.tar.gz +sha256 1c3414d18f9cacdab78b0ffd8e886d56ad45f22e55001a72aaa0b2aeb56a0ad7 setproctitle-1.1.9.tar.gz diff --git a/package/python-setproctitle/python-setproctitle.mk b/package/python-setproctitle/python-setproctitle.mk new file mode 100644 index 0000000000..63dfad0cf5 --- /dev/null +++ b/package/python-setproctitle/python-setproctitle.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-setproctitle +# +################################################################################ + +PYTHON_SETPROCTITLE_VERSION = 1.1.9 +PYTHON_SETPROCTITLE_SOURCE = setproctitle-$(PYTHON_SETPROCTITLE_VERSION).tar.gz +PYTHON_SETPROCTITLE_SITE = http://pypi.python.org/packages/source/s/setproctitle +PYTHON_SETPROCTITLE_LICENSE = BSD-3c +PYTHON_SETPROCTITLE_LICENSE_FILES = COPYRIGHT +PYTHON_SETPROCTITLE_SETUP_TYPE = distutils + +$(eval $(python-package)) From d3c8633ed6914a6c1f12b2ce56f18ac08979d3c2 Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Sun, 7 Feb 2016 00:00:00 +0100 Subject: [PATCH 055/206] python-wsaccel: new package Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-wsaccel/Config.in | 6 ++++++ package/python-wsaccel/python-wsaccel.hash | 3 +++ package/python-wsaccel/python-wsaccel.mk | 13 +++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 package/python-wsaccel/Config.in create mode 100644 package/python-wsaccel/python-wsaccel.hash create mode 100644 package/python-wsaccel/python-wsaccel.mk diff --git a/package/Config.in b/package/Config.in index 486228009f..7a9ed0a686 100644 --- a/package/Config.in +++ b/package/Config.in @@ -735,6 +735,7 @@ menu "External python modules" source "package/python-webpy/Config.in" source "package/python-werkzeug/Config.in" source "package/python-ws4py/Config.in" + source "package/python-wsaccel/Config.in" source "package/python-zope-interface/Config.in" endmenu endif diff --git a/package/python-wsaccel/Config.in b/package/python-wsaccel/Config.in new file mode 100644 index 0000000000..ee61e8a07a --- /dev/null +++ b/package/python-wsaccel/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_WSACCEL + bool "python-wsaccel" + help + Accelerator for ws4py and AutobahnPython. + + https://pypi.python.org/pypi/wsaccel diff --git a/package/python-wsaccel/python-wsaccel.hash b/package/python-wsaccel/python-wsaccel.hash new file mode 100644 index 0000000000..a02b5a8712 --- /dev/null +++ b/package/python-wsaccel/python-wsaccel.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=2b4ea3d6847855c0587d37fca9db0557, sha256 locally computed. +md5 2b4ea3d6847855c0587d37fca9db0557 wsaccel-0.6.2.tar.gz +sha256 425706acf0724d2f6bfa391ec37b4ef121d3432c956029de3cea4e101c218e0c wsaccel-0.6.2.tar.gz diff --git a/package/python-wsaccel/python-wsaccel.mk b/package/python-wsaccel/python-wsaccel.mk new file mode 100644 index 0000000000..3e7b3324b9 --- /dev/null +++ b/package/python-wsaccel/python-wsaccel.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-wsaccel +# +################################################################################ + +PYTHON_WSACCEL_VERSION = 0.6.2 +PYTHON_WSACCEL_SOURCE = wsaccel-$(PYTHON_WSACCEL_VERSION).tar.gz +PYTHON_WSACCEL_SITE = http://pypi.python.org/packages/source/w/wsaccel +PYTHON_WSACCEL_LICENSE = Apache-2.0 +PYTHON_WSACCEL_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 536ba133b04aa8b4991c411dcd2b76be849127ee Mon Sep 17 00:00:00 2001 From: Ariel D'Alessandro Date: Mon, 15 Feb 2016 12:29:50 -0300 Subject: [PATCH 056/206] mali-t76x: add new package Package provides the binary user-space components for the ARM Mali Midgard T76X GPU. Note that this package requires a kernel with the ARM Mali Midgard GPU Kernel Drivers enabled. Signed-off-by: Ariel D'Alessandro Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/mali-t76x/Config.in | 28 ++++++++++++++++++++++++++++ package/mali-t76x/egl.pc | 11 +++++++++++ package/mali-t76x/glesv2.pc | 11 +++++++++++ package/mali-t76x/mali-t76x.hash | 2 ++ package/mali-t76x/mali-t76x.mk | 27 +++++++++++++++++++++++++++ 6 files changed, 80 insertions(+) create mode 100644 package/mali-t76x/Config.in create mode 100644 package/mali-t76x/egl.pc create mode 100644 package/mali-t76x/glesv2.pc create mode 100644 package/mali-t76x/mali-t76x.hash create mode 100644 package/mali-t76x/mali-t76x.mk diff --git a/package/Config.in b/package/Config.in index 7a9ed0a686..11569d3c36 100644 --- a/package/Config.in +++ b/package/Config.in @@ -399,6 +399,7 @@ endif source "package/lshw/Config.in" source "package/lsuio/Config.in" source "package/lvm2/Config.in" + source "package/mali-t76x/Config.in" source "package/mdadm/Config.in" source "package/memtest86/Config.in" source "package/memtester/Config.in" diff --git a/package/mali-t76x/Config.in b/package/mali-t76x/Config.in new file mode 100644 index 0000000000..6c2ae4eb85 --- /dev/null +++ b/package/mali-t76x/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_MALI_T76X + bool "mali-t76x" + select BR2_PACKAGE_MESA3D_HEADERS + select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBGLES + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_ARM_EABIHF + depends on BR2_arm + help + Install the binary user-space components for the ARM Mali Midgard + T76X GPU. This package requires a kernel with the ARM Mali Midgard + GPU Kernel Drivers enabled. + + Source: http://malideveloper.arm.com/resources/drivers/ + +if BR2_PACKAGE_MALI_T76X + +config BR2_PACKAGE_PROVIDES_LIBEGL + default "mali-t76x" + +config BR2_PACKAGE_PROVIDES_LIBGLES + default "mali-t76x" + +endif + +comment "mali-t76x needs an (e)glibc toolchain with armhf enabled" + depends on BR2_arm + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/mali-t76x/egl.pc b/package/mali-t76x/egl.pc new file mode 100644 index 0000000000..614b700d64 --- /dev/null +++ b/package/mali-t76x/egl.pc @@ -0,0 +1,11 @@ +prefix=/usr/ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: egl +Description: ARM Mali implementation of EGL +Version: 1.5 +Requires: +Libs: -L${libdir} -lEGL -lGLESv2 +Cflags: -I${includedir} -DMESA_EGL_NO_X11_HEADERS diff --git a/package/mali-t76x/glesv2.pc b/package/mali-t76x/glesv2.pc new file mode 100644 index 0000000000..5997eac63f --- /dev/null +++ b/package/mali-t76x/glesv2.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: glesv2 +Description: ARM Mali implementation of OpenGL ESv2 +Version: 2.0 +Requires: +Libs: -L${libdir} -lGLESv2 -lGLESv1_CM +Cflags: -I${includedir} -DMESA_EGL_NO_X11_HEADERS diff --git a/package/mali-t76x/mali-t76x.hash b/package/mali-t76x/mali-t76x.hash new file mode 100644 index 0000000000..a754b98074 --- /dev/null +++ b/package/mali-t76x/mali-t76x.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 5a0b00438edc8066b374481d3332a43c07ec2bd3bc73265983a968970f754902 mali-t76x_r5p0-06rel0_linux_1+fbdev.tar.gz diff --git a/package/mali-t76x/mali-t76x.mk b/package/mali-t76x/mali-t76x.mk new file mode 100644 index 0000000000..702f583952 --- /dev/null +++ b/package/mali-t76x/mali-t76x.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# mali-t76x +# +################################################################################ + +MALI_T76X_VERSION = r5p0-06rel0 +MALI_T76X_SOURCE = mali-t76x_$(MALI_T76X_VERSION)_linux_1+fbdev.tar.gz +MALI_T76X_SITE = http://malideveloper.arm.com/downloads/drivers/binary/$(MALI_T76X_VERSION) + +MALI_T76X_INSTALL_STAGING = YES +MALI_T76X_PROVIDES = libegl libgles + +define MALI_T76X_INSTALL_STAGING_CMDS + $(INSTALL) -m 755 $(@D)/*.so $(STAGING_DIR)/usr/lib/ + + $(INSTALL) -D -m 0644 package/mali-t76x/egl.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc + $(INSTALL) -D -m 0644 package/mali-t76x/glesv2.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc +endef + +define MALI_T76X_INSTALL_TARGET_CMDS + $(INSTALL) -m 755 $(@D)/*.so $(TARGET_DIR)/usr/lib/ +endef + +$(eval $(generic-package)) From 803539e77c66747aaec144f56762dbbeed6194cf Mon Sep 17 00:00:00 2001 From: Ariel D'Alessandro Date: Mon, 15 Feb 2016 12:29:51 -0300 Subject: [PATCH 057/206] board/firefly_rk3288: add new board This commit adds basic configuration files for the Firefly RK3288 board. Both minimal and demo defconfigs are added. The latter enables Qt5 with the required Mali T76X GPU user space components. More info about the board: http://en.t-firefly.com/en/firenow/firefly_rk3288/specifications/ [Peter: use same-as-kernel for kernel headers] Signed-off-by: Ariel D'Alessandro Signed-off-by: Peter Korsgaard --- board/firefly/firefly-rk3288/extlinux.conf | 6 ++++ board/firefly/firefly-rk3288/post-build.sh | 3 ++ board/firefly/firefly-rk3288/post-image.sh | 20 +++++++++++ board/firefly/firefly-rk3288/readme.txt | 40 ++++++++++++++++++++++ board/firefly/firefly-rk3288/sd-image.cfg | 22 ++++++++++++ configs/firefly_rk3288_defconfig | 31 +++++++++++++++++ configs/firefly_rk3288_demo_defconfig | 39 +++++++++++++++++++++ 7 files changed, 161 insertions(+) create mode 100644 board/firefly/firefly-rk3288/extlinux.conf create mode 100755 board/firefly/firefly-rk3288/post-build.sh create mode 100755 board/firefly/firefly-rk3288/post-image.sh create mode 100644 board/firefly/firefly-rk3288/readme.txt create mode 100644 board/firefly/firefly-rk3288/sd-image.cfg create mode 100644 configs/firefly_rk3288_defconfig create mode 100644 configs/firefly_rk3288_demo_defconfig diff --git a/board/firefly/firefly-rk3288/extlinux.conf b/board/firefly/firefly-rk3288/extlinux.conf new file mode 100644 index 0000000000..39ac5b9dac --- /dev/null +++ b/board/firefly/firefly-rk3288/extlinux.conf @@ -0,0 +1,6 @@ +default firefly-rk3288 + +label firefly-rk3288 +kernel /boot/uImage +devicetree /boot/rk3288-firefly.dtb +append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait diff --git a/board/firefly/firefly-rk3288/post-build.sh b/board/firefly/firefly-rk3288/post-build.sh new file mode 100755 index 0000000000..94e89ce6a4 --- /dev/null +++ b/board/firefly/firefly-rk3288/post-build.sh @@ -0,0 +1,3 @@ +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/firefly/firefly-rk3288/post-image.sh b/board/firefly/firefly-rk3288/post-image.sh new file mode 100755 index 0000000000..1dd30a6e7e --- /dev/null +++ b/board/firefly/firefly-rk3288/post-image.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +MKIMAGE=$HOST_DIR/usr/bin/mkimage + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/sd-image.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/board/firefly/firefly-rk3288/readme.txt b/board/firefly/firefly-rk3288/readme.txt new file mode 100644 index 0000000000..d6210857f1 --- /dev/null +++ b/board/firefly/firefly-rk3288/readme.txt @@ -0,0 +1,40 @@ +Firefly RK3288 + +How to build it +=============== + + $ make firefly_rk3288_defconfig + +Then you can edit the build options using + + $ make menuconfig + +Compile all and build rootfs image: + + $ make + +Result of the build +------------------- + +After building, you should get a tree like this: + + output/images/ + ├── rk3288-firefly.dtb + ├── rootfs.ext2 + ├── rootfs.ext4 -> rootfs.ext2 + ├── sdcard.img + ├── u-boot-dtb.img + ├── u-boot-spl-dtb.bin + ├── u-boot-spl-dtb.img + └── uImage + +Prepare your SDCard +=================== + +Buildroot generates a ready-to-use SD card image that you can flash directly to +the card. The image will be in output/images/sdcard.img. +You can write this image directly to an SD card device (i.e. /dev/xxx): + + $ dd if=output/images/sdcard.img of=/dev/xxx + +Finally, you can insert the SD card to the Firefly RK3288 board and boot it. diff --git a/board/firefly/firefly-rk3288/sd-image.cfg b/board/firefly/firefly-rk3288/sd-image.cfg new file mode 100644 index 0000000000..a9eb9f0142 --- /dev/null +++ b/board/firefly/firefly-rk3288/sd-image.cfg @@ -0,0 +1,22 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-spl-dtb { + in-partition-table = "no" + image = "u-boot-spl-dtb.img" + offset = 32K + } + + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 128K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/configs/firefly_rk3288_defconfig b/configs/firefly_rk3288_defconfig new file mode 100644 index 0000000000..bd3faa62ba --- /dev/null +++ b/configs/firefly_rk3288_defconfig @@ -0,0 +1,31 @@ +BR2_arm=y +BR2_cortex_a12=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y +BR2_TARGET_GENERIC_HOSTNAME="firefly-rk3288" +BR2_TARGET_GENERIC_ISSUE="Welcome to FIREFLY RK3288!" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/firefly-rk3288/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/firefly/firefly-rk3288/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git@github.com:mmind/linux-rockchip.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ccb89e9b5657b4911c16d08e1581121222ee12c4" +BR2_LINUX_KERNEL_DEFCONFIG="rk3288_veyron" +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-firefly" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="firefly-rk3288" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/firefly_rk3288_demo_defconfig b/configs/firefly_rk3288_demo_defconfig new file mode 100644 index 0000000000..4a0aca12d0 --- /dev/null +++ b/configs/firefly_rk3288_demo_defconfig @@ -0,0 +1,39 @@ +BR2_arm=y +BR2_cortex_a12=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TARGET_GENERIC_HOSTNAME="firefly-rk3288" +BR2_TARGET_GENERIC_ISSUE="Welcome to FIREFLY RK3288!" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/firefly-rk3288/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/firefly/firefly-rk3288/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git@github.com:mmind/linux-rockchip.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ccb89e9b5657b4911c16d08e1581121222ee12c4" +BR2_LINUX_KERNEL_DEFCONFIG="rk3288_veyron" +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-firefly" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_PACKAGE_QT5=y +BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y +BR2_PACKAGE_QT5BASE_EXAMPLES=y +BR2_PACKAGE_QT5BASE_GUI=y +BR2_PACKAGE_QT5BASE_EGLFS=y +BR2_PACKAGE_MALI_T76X=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="firefly-rk3288" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y From 16340faebb0cc4fc88d29550d5a57e3c80357695 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sat, 20 Feb 2016 01:24:59 -0200 Subject: [PATCH 058/206] tmux: bump to version 2.1 Add patch to fix musl build by removing inclusion of sys/cdefs.h. Patch was backported from upstream master and can be dropped in the next version bump. Update homepage link Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- .../tmux/0001-remove-use-of-sys-cdefs.h.patch | 42 +++++++++++++++++++ package/tmux/Config.in | 2 +- package/tmux/tmux.hash | 2 +- package/tmux/tmux.mk | 2 +- 4 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 package/tmux/0001-remove-use-of-sys-cdefs.h.patch diff --git a/package/tmux/0001-remove-use-of-sys-cdefs.h.patch b/package/tmux/0001-remove-use-of-sys-cdefs.h.patch new file mode 100644 index 0000000000..929953fa9d --- /dev/null +++ b/package/tmux/0001-remove-use-of-sys-cdefs.h.patch @@ -0,0 +1,42 @@ +From 29e4794ca396a8db8a468ec74559922d2af5a987 Mon Sep 17 00:00:00 2001 +From: Nicholas Marriott +Date: Tue, 24 Nov 2015 18:46:50 +0000 +Subject: [PATCH] -sys/queue.h in proc.c, and nuke the unnecessary C++ header + guards stuff and sys/cdefs.h in vis.h (it causes problems on some platforms). + Reported by someone on GitHub, issue 212. + +--- +Backported from master upstream to fix musl build +https://github.com/tmux/tmux/commit/7b085136a7291cbcdfcc53182fbd13aaca70306e + +proc.c does not exist on version 2.1 + +Signed-off-by: Ricardo Martincoski +--- + compat/vis.h | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/compat/vis.h b/compat/vis.h +index 6795139..9f12d23 100644 +--- a/compat/vis.h ++++ b/compat/vis.h +@@ -73,9 +73,6 @@ + */ + #define UNVIS_END 1 /* no more characters */ + +-#include +- +-__BEGIN_DECLS + char *vis(char *, int, int, int); + int strvis(char *, const char *, int); + int stravis(char **, const char *, int); +@@ -85,6 +82,4 @@ int strunvis(char *, const char *); + int unvis(char *, char, int *, int); + ssize_t strnunvis(char *, const char *, size_t); + +-__END_DECLS +- + #endif /* !_VIS_H_ */ +-- +1.9.1 + diff --git a/package/tmux/Config.in b/package/tmux/Config.in index fa8f64add9..61719e4866 100644 --- a/package/tmux/Config.in +++ b/package/tmux/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_TMUX tmux is a terminal multiplexer, it enables a number of terminals (or windows) to be accessed and controlled from a single terminal. - http://tmux.sourceforge.net/ + https://tmux.github.io/ diff --git a/package/tmux/tmux.hash b/package/tmux/tmux.hash index ab7c4d333a..e732aa24bb 100644 --- a/package/tmux/tmux.hash +++ b/package/tmux/tmux.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 795f4b4446b0ea968b9201c25e8c1ef8a6ade710ebca4657dd879c35916ad362 tmux-2.0.tar.gz +sha256 31564e7bf4bcef2defb3cb34b9e596bd43a3937cad9e5438701a81a5a9af6176 tmux-2.1.tar.gz diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index c9abbf77f8..40f1a13898 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -4,7 +4,7 @@ # ################################################################################ -TMUX_VERSION = 2.0 +TMUX_VERSION = 2.1 TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = README From c31487c6c69db8624300bf3c349ac2fc12d15590 Mon Sep 17 00:00:00 2001 From: Gabe Evans Date: Wed, 17 Feb 2016 18:52:47 +0000 Subject: [PATCH 059/206] package/systemd: bump version to 229 Signed-off-by: Gabe Evans Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 8090200043..729598608d 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 dd124ff561a07e6439ed2b3713f38ca914df7747f110ce86deea17b56d245ae6 systemd-228.tar.gz +sha256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 systemd-229.tar.gz diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index e4320697f6..b2cce11b09 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 228 +SYSTEMD_VERSION = 229 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = LGPLv2.1+, GPLv2+ (udev), Public Domain (few source files, see README) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README From ddb8ff9d95d71cee6fb965817d077409dd3056a6 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Fri, 5 Feb 2016 17:09:40 +0000 Subject: [PATCH 060/206] package/zip: add host-zip Make the host variant of zip available. This can be useful in post-{build,image} scripts. Signed-off-by: Martin Bark Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/Config.in.host | 1 + package/zip/Config.in.host | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 package/zip/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 1c691a3508..09c98fb77f 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -32,5 +32,6 @@ menu "Host utilities" source "package/uboot-tools/Config.in.host" source "package/util-linux/Config.in.host" source "package/vboot-utils/Config.in.host" + source "package/zip/Config.in.host" endmenu diff --git a/package/zip/Config.in.host b/package/zip/Config.in.host new file mode 100644 index 0000000000..b14ce55dbd --- /dev/null +++ b/package/zip/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_ZIP + bool "host zip" + help + Zip is a compression and file packaging/archive utility. + Although highly compatible both with PKWARE's PKZIP and + PKUNZIP utilities for MS-DOS and with Info-ZIP's own UnZip, + our primary objectives have been portability and + other-than-MSDOS functionality. + + http://infozip.sourceforge.net/Zip.html From b3258b7535db3d6da8d6067e996982d3a7f98217 Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Sat, 6 Feb 2016 23:59:51 +0100 Subject: [PATCH 061/206] python-pynacl: new package Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov [Thomas: - remove python-six from the build dependencies, it is only a runtime dependency - add host-python-cffi in the build dependencies.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-pynacl/Config.in | 9 +++++++++ package/python-pynacl/python-pynacl.hash | 3 +++ package/python-pynacl/python-pynacl.mk | 16 ++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-pynacl/Config.in create mode 100644 package/python-pynacl/python-pynacl.hash create mode 100644 package/python-pynacl/python-pynacl.mk diff --git a/package/Config.in b/package/Config.in index 11569d3c36..d979da2b9b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -691,6 +691,7 @@ menu "External python modules" source "package/python-pygame/Config.in" source "package/python-pygments/Config.in" source "package/python-pyinotify/Config.in" + source "package/python-pynacl/Config.in" source "package/python-pyopenssl/Config.in" source "package/python-pyparsing/Config.in" source "package/python-pyparted/Config.in" diff --git a/package/python-pynacl/Config.in b/package/python-pynacl/Config.in new file mode 100644 index 0000000000..5a53648cb9 --- /dev/null +++ b/package/python-pynacl/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_PYNACL + bool "python-pynacl" + select BR2_PACKAGE_LIBSODIUM + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_CFFI # runtime + help + Python binding to the Networking and Cryptography (NaCl) library. + + https://pypi.python.org/pypi/PyNaCl diff --git a/package/python-pynacl/python-pynacl.hash b/package/python-pynacl/python-pynacl.hash new file mode 100644 index 0000000000..7035ac7637 --- /dev/null +++ b/package/python-pynacl/python-pynacl.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=12fd03d8ce64e0318cb1c69272f17704, sha256 locally computed. +md5 12fd03d8ce64e0318cb1c69272f17704 PyNaCl-1.0.1.tar.gz +sha256 d21d7a7358a85fb9b9ddadfbd1176c40fe199334fe2202881255e77f6d3773f4 PyNaCl-1.0.1.tar.gz diff --git a/package/python-pynacl/python-pynacl.mk b/package/python-pynacl/python-pynacl.mk new file mode 100644 index 0000000000..e1769b8f70 --- /dev/null +++ b/package/python-pynacl/python-pynacl.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-pynacl +# +################################################################################ + +PYTHON_PYNACL_VERSION = 1.0.1 +PYTHON_PYNACL_SOURCE = PyNaCl-$(PYTHON_PYNACL_VERSION).tar.gz +PYTHON_PYNACL_SITE = http://pypi.python.org/packages/source/P/PyNaCl +PYTHON_PYNACL_LICENSE = Apache-2.0 +PYTHON_PYNACL_LICENSE_FILES = LICENSE +PYTHON_PYNACL_SETUP_TYPE = setuptools +PYTHON_PYNACL_DEPENDENCIES = libsodium host-python-cffi +PYTHON_PYNACL_ENV = SODIUM_INSTALL=system + +$(eval $(python-package)) From 2b51d9ddf8160067c983212902151e0f48c1a7af Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Thu, 11 Feb 2016 11:58:47 +0100 Subject: [PATCH 062/206] python-autobahn: new package Signed-off-by: Mauro Condarelli [Thomas: remove dependency on having .py files, since it builds fine and imports fine with .pyc files only.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-autobahn/Config.in | 9 +++++++++ package/python-autobahn/python-autobahn.hash | 3 +++ package/python-autobahn/python-autobahn.mk | 14 ++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-autobahn/Config.in create mode 100644 package/python-autobahn/python-autobahn.hash create mode 100644 package/python-autobahn/python-autobahn.mk diff --git a/package/Config.in b/package/Config.in index d979da2b9b..df96d40455 100644 --- a/package/Config.in +++ b/package/Config.in @@ -620,6 +620,7 @@ endif if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 menu "External python modules" source "package/python-alsaaudio/Config.in" + source "package/python-autobahn/Config.in" source "package/python-backports-abc/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bottle/Config.in" diff --git a/package/python-autobahn/Config.in b/package/python-autobahn/Config.in new file mode 100644 index 0000000000..7e1429cdd7 --- /dev/null +++ b/package/python-autobahn/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_AUTOBAHN + bool "python-autobahn" + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_TXAIO # runtime + help + WebSocket client Hhh server library, WAMP real-time + framework. + + https://pypi.python.org/pypi/autobahn diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash new file mode 100644 index 0000000000..8f55ac1301 --- /dev/null +++ b/package/python-autobahn/python-autobahn.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=b4b5445050749c1033b9b58f694f0c64, sha256 locally computed. +md5 b4b5445050749c1033b9b58f694f0c64 autobahn-0.12.1.tar.gz +sha256 664223879e159c88221f42d8d1ac6b8c4268d8b9316d8ab69a02761c5744cd79 autobahn-0.12.1.tar.gz diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk new file mode 100644 index 0000000000..1d0286712f --- /dev/null +++ b/package/python-autobahn/python-autobahn.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-autobahn +# +################################################################################ + +PYTHON_AUTOBAHN_VERSION = 0.12.1 +PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz +PYTHON_AUTOBAHN_SITE = http://pypi.python.org/packages/source/a/autobahn +PYTHON_AUTOBAHN_LICENSE = MIT +PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE +PYTHON_AUTOBAHN_SETUP_TYPE = setuptools + +$(eval $(python-package)) From ecaf8972c41b03ad161fe2924577319b7d7ba165 Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Thu, 11 Feb 2016 11:58:48 +0100 Subject: [PATCH 063/206] python-crossbar: new package Signed-off-by: Mauro Condarelli Reviewed-by: Yegor Yefremov [Thomas: - Remove dependency on having .py files, since building/testing with .pyc files only was successful. - Remove the "# runtime" comment for all dependencies, and only mention it once before all "select". - Add missing dependencies on: BR2_PACKAGE_PYTHON_PYCPARSER and BR2_PACKAGE_PYTHON_LMDB. - Use AGPLv3 for the license instead of AGPL3.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-crossbar/Config.in | 37 ++++++++++++++++++++ package/python-crossbar/python-crossbar.hash | 3 ++ package/python-crossbar/python-crossbar.mk | 14 ++++++++ 4 files changed, 55 insertions(+) create mode 100644 package/python-crossbar/Config.in create mode 100644 package/python-crossbar/python-crossbar.hash create mode 100644 package/python-crossbar/python-crossbar.mk diff --git a/package/Config.in b/package/Config.in index df96d40455..4513e4f539 100644 --- a/package/Config.in +++ b/package/Config.in @@ -637,6 +637,7 @@ menu "External python modules" source "package/python-configshell-fb/Config.in" source "package/python-crc16/Config.in" source "package/python-cryptography/Config.in" + source "package/python-crossbar/Config.in" source "package/python-cssselect/Config.in" source "package/python-daemon/Config.in" source "package/python-dialog/Config.in" diff --git a/package/python-crossbar/Config.in b/package/python-crossbar/Config.in new file mode 100644 index 0000000000..84c65c1b15 --- /dev/null +++ b/package/python-crossbar/Config.in @@ -0,0 +1,37 @@ +config BR2_PACKAGE_PYTHON_CROSSBAR + bool "python-crossbar" + # All the following dependencies are runtime dependencies + select BR2_PACKAGE_PYTHON_AUTOBAHN + select BR2_PACKAGE_PYTHON_CBOR + select BR2_PACKAGE_PYTHON_CLICK + select BR2_PACKAGE_PYTHON_PYCPARSER + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY + select BR2_PACKAGE_PYTHON_JINJA2 + select BR2_PACKAGE_PYTHON_LMDB + select BR2_PACKAGE_PYTHON_MISTUNE + select BR2_PACKAGE_PYTHON_MSGPACK + select BR2_PACKAGE_PYTHON_NETADDR + select BR2_PACKAGE_PYTHON_PSUTIL + select BR2_PACKAGE_PYTHON_PYASN + select BR2_PACKAGE_PYTHON_PYASN_MODULES + select BR2_PACKAGE_PYTHON_PYGMENTS + select BR2_PACKAGE_PYTHON_PYINOTIFY + select BR2_PACKAGE_PYTHON_PYNACL + select BR2_PACKAGE_PYTHON_PYOPENSSL + select BR2_PACKAGE_PYTHON_PYTRIE + select BR2_PACKAGE_PYTHON_PYYAML + select BR2_PACKAGE_PYTHON_SETUPTOOLS + select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY + select BR2_PACKAGE_PYTHON_SETPROCTITLE + select BR2_PACKAGE_PYTHON_SETUPTOOLS + select BR2_PACKAGE_PYTHON_SHUTILWHICH if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON_TREQ + select BR2_PACKAGE_PYTHON_TWISTED + select BR2_PACKAGE_PYTHON_UJSON + select BR2_PACKAGE_PYTHON_WSACCEL + help + Crossbar.io is an open-source WAMP application router that + allows to build advanced applications from loosely-coupled + components that can talk in real-time with each other. + + https://pypi.python.org/pypi/crossbar diff --git a/package/python-crossbar/python-crossbar.hash b/package/python-crossbar/python-crossbar.hash new file mode 100644 index 0000000000..0690e56d51 --- /dev/null +++ b/package/python-crossbar/python-crossbar.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=cbe9b62a1ec2eebbc0cd0cef887a4993, sha256 locally computed. +md5 cbe9b62a1ec2eebbc0cd0cef887a4993 crossbar-0.12.1.tar.gz +sha256 4919e683bcfa3c633da8207f24189fd196ef8412b647f0365cf74c0bff8b4ada crossbar-0.12.1.tar.gz diff --git a/package/python-crossbar/python-crossbar.mk b/package/python-crossbar/python-crossbar.mk new file mode 100644 index 0000000000..96bc2544f9 --- /dev/null +++ b/package/python-crossbar/python-crossbar.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-crossbar +# +################################################################################ + +PYTHON_CROSSBAR_VERSION = 0.12.1 +PYTHON_CROSSBAR_SOURCE = crossbar-$(PYTHON_CROSSBAR_VERSION).tar.gz +PYTHON_CROSSBAR_SITE = http://pypi.python.org/packages/source/c/crossbar +PYTHON_CROSSBAR_LICENSE = AGPLv3 +PYTHON_CROSSBAR_LICENSE_FILES = LICENSE +PYTHON_CROSSBAR_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 9b965272379cc825d64da795db564edadbf5720c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 20 Feb 2016 15:39:17 +0100 Subject: [PATCH 064/206] package: fix alphabetic ordering in Config.in The python-crossbar package was not added at the right location, so this commit fixes the alphabetic ordering. Signed-off-by: Thomas Petazzoni --- package/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Config.in b/package/Config.in index 4513e4f539..75f8132578 100644 --- a/package/Config.in +++ b/package/Config.in @@ -636,8 +636,8 @@ menu "External python modules" source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" source "package/python-crc16/Config.in" - source "package/python-cryptography/Config.in" source "package/python-crossbar/Config.in" + source "package/python-cryptography/Config.in" source "package/python-cssselect/Config.in" source "package/python-daemon/Config.in" source "package/python-dialog/Config.in" From 404597a5db071ea8ee290268c12723217b793fe3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 10 Feb 2016 09:13:26 -0300 Subject: [PATCH 065/206] wpan-tools: new package Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + .../0001-fix-build-with-newer-libnl.patch | 40 +++++++++++++++++++ package/wpan-tools/Config.in | 11 +++++ package/wpan-tools/wpan-tools.hash | 4 ++ package/wpan-tools/wpan-tools.mk | 13 ++++++ 5 files changed, 69 insertions(+) create mode 100644 package/wpan-tools/0001-fix-build-with-newer-libnl.patch create mode 100644 package/wpan-tools/Config.in create mode 100644 package/wpan-tools/wpan-tools.hash create mode 100644 package/wpan-tools/wpan-tools.mk diff --git a/package/Config.in b/package/Config.in index 75f8132578..023a1906c0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1505,6 +1505,7 @@ endif source "package/wireless_tools/Config.in" source "package/wireshark/Config.in" source "package/wpa_supplicant/Config.in" + source "package/wpan-tools/Config.in" source "package/wvdial/Config.in" source "package/xinetd/Config.in" source "package/xl2tp/Config.in" diff --git a/package/wpan-tools/0001-fix-build-with-newer-libnl.patch b/package/wpan-tools/0001-fix-build-with-newer-libnl.patch new file mode 100644 index 0000000000..03e1a03340 --- /dev/null +++ b/package/wpan-tools/0001-fix-build-with-newer-libnl.patch @@ -0,0 +1,40 @@ +From 51ab69d76aa708c79aed971ee4083abb8cc07201 Mon Sep 17 00:00:00 2001 +From: Stefan Schmidt +Date: Mon, 9 Nov 2015 19:06:25 +0100 +Subject: [PATCH] build: avoid redefinition errors with libnl >= 3.2.27 + +From 3.2.17 onwards we have nla for s8, s16, etc defined directly in libnl. +If we keep including this file anyway we run into redefinition errors. Better +include use our own only for earlier versions. + +Happened to me on Fedora 22 after my last update. + +Signed-off-by: Stefan Schmidt +Acked-by: Alexander Aring +Signed-off-by: Gustavo Zacarias +--- +Patch status: upstream + + src/nl_extras.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/nl_extras.h b/src/nl_extras.h +index 9d841aa..c4d1d14 100644 +--- a/src/nl_extras.h ++++ b/src/nl_extras.h +@@ -1,6 +1,8 @@ + #ifndef __NL_EXTRAS_H + #define __NL_EXTRAS_H + ++#if LIBNL_VER_MIC <= 26 ++ + #ifndef NLA_S8 + + #define NLA_S8 13 +@@ -43,4 +45,6 @@ static inline int32_t nla_get_s32(struct nlattr *nla) + + #endif /* NLA_S64 */ + ++#endif /* LIBNL_VER_MIC */ ++ + #endif /* __NL_EXTRAS_H */ diff --git a/package/wpan-tools/Config.in b/package/wpan-tools/Config.in new file mode 100644 index 0000000000..9e327420a0 --- /dev/null +++ b/package/wpan-tools/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_WPAN_TOOLS + bool "wpan-tools" + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBNL + help + Userspace tools for Linux IEEE 802.15.4 stack. + + http://wpan.cakelab.org/ + +comment "wpan-tools needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/wpan-tools/wpan-tools.hash b/package/wpan-tools/wpan-tools.hash new file mode 100644 index 0000000000..fbcf64c081 --- /dev/null +++ b/package/wpan-tools/wpan-tools.hash @@ -0,0 +1,4 @@ +# From http://wpan.cakelab.org/releases/md5sum +md5 c6356f7be4de2e9f2084283b9ed7e1ab wpan-tools-0.5.tar.gz +# Calculated based on the hash above +sha256 f381f24eb1962aa9e21751004560371bb9ad8bd0b735bc493930f50e8c1f3d99 wpan-tools-0.5.tar.gz diff --git a/package/wpan-tools/wpan-tools.mk b/package/wpan-tools/wpan-tools.mk new file mode 100644 index 0000000000..d223800449 --- /dev/null +++ b/package/wpan-tools/wpan-tools.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# wpan-tools +# +################################################################################ + +WPAN_TOOLS_VERSION = 0.5 +WPAN_TOOLS_SITE = http://wpan.cakelab.org/releases +WPAN_TOOLS_DEPENDENCIES = host-pkgconf libnl +WPAN_TOOLS_LICENSE = iw license +WPAN_TOOLS_LICENSE_FILES = COPYING + +$(eval $(autotools-package)) From f8a263fe361ab37ec6765b9ff6478c3b15e3d139 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 10 Feb 2016 10:23:30 -0300 Subject: [PATCH 066/206] privoxy: new package Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/privoxy/Config.in | 12 ++++++++++++ package/privoxy/privoxy.hash | 3 +++ package/privoxy/privoxy.mk | 16 ++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 package/privoxy/Config.in create mode 100644 package/privoxy/privoxy.hash create mode 100644 package/privoxy/privoxy.mk diff --git a/package/Config.in b/package/Config.in index 023a1906c0..8aa6bb50e8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1446,6 +1446,7 @@ endif source "package/portmap/Config.in" source "package/pppd/Config.in" source "package/pptp-linux/Config.in" + source "package/privoxy/Config.in" source "package/proftpd/Config.in" source "package/proxychains-ng/Config.in" source "package/ptpd/Config.in" diff --git a/package/privoxy/Config.in b/package/privoxy/Config.in new file mode 100644 index 0000000000..8d8d01a73f --- /dev/null +++ b/package/privoxy/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PRIVOXY + bool "privoxy" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_ZLIB + help + A non-caching web proxy with advanced filtering capabilities + for enhancing privacy, modifying web page data and HTTP + headers, controlling access, and removing ads and other + obnoxious Internet junk. + + http://www.privoxy.org/ diff --git a/package/privoxy/privoxy.hash b/package/privoxy/privoxy.hash new file mode 100644 index 0000000000..aea8f2d587 --- /dev/null +++ b/package/privoxy/privoxy.hash @@ -0,0 +1,3 @@ +# From http://sourceforge.net/projects/ijbswa/files/Sources/3.0.24%20%28stable%29/ +md5 44a47d1a5000db8cccd61ace0e25e7f7 privoxy-3.0.24-stable-src.tar.gz +sha1 343c547a9e795ff029a78310963e0c04448975ee privoxy-3.0.24-stable-src.tar.gz diff --git a/package/privoxy/privoxy.mk b/package/privoxy/privoxy.mk new file mode 100644 index 0000000000..4b5a1a6d30 --- /dev/null +++ b/package/privoxy/privoxy.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# privoxy +# +################################################################################ + +PRIVOXY_VERSION = 3.0.24 +PRIVOXY_SITE = http://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 +PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz +# configure not shipped +PRIVOXY_AUTORECONF = YES +PRIVOXY_DEPENDENCIES = pcre zlib +PRIVOXY_LICENSE = GPLv2+ +PRIVOXY_LICENSE_FILES = LICENSE + +$(eval $(autotools-package)) From d30102693aa562f026b78ee260e46cc7b4751e3a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 Feb 2016 15:57:40 +0100 Subject: [PATCH 067/206] package/x11r7/xdriver_xf86-video-geode: bump version to 2.11.18 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash | 4 ++-- .../xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash index 991cf6b737..b05983fd0c 100644 --- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash +++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-May/002607.html -sha256 07b4d42623e71e592b77c52a75cf230f8e711c8a0c1b26cecb06e9231d333c41 xf86-video-geode-2.11.17.tar.bz2 +# From http://lists.x.org/archives/xorg-announce/2016-February/002673.html +sha256 d6ece9a862a68be3cdf86a87e0e1ba5e199168b8d075129646638f53649ba9e8 xf86-video-geode-2.11.18.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk index ae5bc0b488..b882f1f857 100644 --- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk +++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.17 +XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.18 XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_GEODE_LICENSE = MIT From b640c257ea96cf6a81b804c902f11dbeb4ff6836 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:27 -0500 Subject: [PATCH 068/206] erlang: bump to version 18.2.1 This is a major release of Erlang that includes a licensing change from the EPL to the Apache License, significant changes to the timer APIs, better support for large maps, and security improvements. Signed-off-by: Frank Hunleth Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...ts-fix-incorrect-use-of-ac-egrep-cpp.patch | 79 ------------------- package/erlang/erlang.hash | 5 +- package/erlang/erlang.mk | 10 +-- 3 files changed, 8 insertions(+), 86 deletions(-) delete mode 100644 package/erlang/0004-erts-fix-incorrect-use-of-ac-egrep-cpp.patch diff --git a/package/erlang/0004-erts-fix-incorrect-use-of-ac-egrep-cpp.patch b/package/erlang/0004-erts-fix-incorrect-use-of-ac-egrep-cpp.patch deleted file mode 100644 index bc086975fe..0000000000 --- a/package/erlang/0004-erts-fix-incorrect-use-of-ac-egrep-cpp.patch +++ /dev/null @@ -1,79 +0,0 @@ -Status: upstream -https://github.com/erlang/otp/pull/658 - -Signed-off-by: Johan Oudinet - -From 73392fcb6f8fddba57de6fb7ae6eeafa0e444686 Mon Sep 17 00:00:00 2001 -From: Johan Oudinet -Date: Tue, 24 Mar 2015 15:54:31 +0100 -Subject: [PATCH] erts: Fix incorrect use of AC_EGREP_CPP - -Using 'AC_EGREP_CPP(yes' without restraining the pattern always return -true if it runs from a path containing the string 'yes'. ---- - erts/aclocal.m4 | 2 +- - erts/configure.in | 17 +++++++++-------- - 2 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 -index 5735cde..70a5b40 100644 ---- a/erts/aclocal.m4 -+++ b/erts/aclocal.m4 -@@ -559,7 +559,7 @@ dnl - - AC_DEFUN(LM_SYS_MULTICAST, - [AC_CACHE_CHECK([for multicast support], ac_cv_sys_multicast_support, --[AC_EGREP_CPP(yes, -+[AC_EGREP_CPP(^yes$, - [#include - #include - #include -diff --git a/erts/configure.in b/erts/configure.in -index b3fe48d..9e19e33 100644 ---- a/erts/configure.in -+++ b/erts/configure.in -@@ -1555,10 +1555,11 @@ if test "$have_gethostbyname_r" = yes; then - [Define to flavour of gethostbyname_r])) - ;; - *) -- AC_EGREP_CPP(yes,[#include -- #ifdef __GLIBC__ -- yes -- #endif -+ AC_EGREP_CPP(^yes$,[ -+#include -+#ifdef __GLIBC__ -+yes -+#endif - ], AC_DEFINE(HAVE_GETHOSTBYNAME_R, GHBN_R_GLIBC, - [Define to flavour of gethostbyname_r])) - ;; -@@ -4303,10 +4304,10 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in - SSL_INCLUDE="-I$dir/include" - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=$SSL_INCLUDE -- AC_EGREP_CPP(yes,[ -+ AC_EGREP_CPP(^yes$,[ - #include - #if OPENSSL_VERSION_NUMBER >= 0x0090700fL -- yes -+yes - #endif - ],[ - ssl_found=yes -@@ -4501,10 +4502,10 @@ if test "x$SSL_APP" != "x" ; then - AC_MSG_CHECKING(for OpenSSL kerberos 5 support) - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=$SSL_INCLUDE -- AC_EGREP_CPP(yes,[ -+ AC_EGREP_CPP(^yes$,[ - #include - #ifndef OPENSSL_NO_KRB5 -- yes -+yes - #endif - ],[ - AC_MSG_RESULT([yes]) --- -2.1.0 - diff --git a/package/erlang/erlang.hash b/package/erlang/erlang.hash index 2d6a39aa17..f6519afeb4 100644 --- a/package/erlang/erlang.hash +++ b/package/erlang/erlang.hash @@ -1,2 +1,3 @@ -# From http://www.erlang.org/download/MD5 -md5 346dd0136bf1cc28cebc140e505206bb otp_src_17.5.tar.gz +# md5 from http://www.erlang.org/download/MD5, sha256 locally computed +md5 ebb226d51f89ec54cc83ce5d417ce55e otp_src_18.2.1.tar.gz +sha256 82d76ebfeeda5db64ea5b0f1a04aa0e9ac63380b278722e0e6052249bd3fe39a otp_src_18.2.1.tar.gz diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 848d1ddc44..638d2c2cca 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -5,21 +5,21 @@ ################################################################################ # See note below when updating Erlang -ERLANG_VERSION = 17.5 +ERLANG_VERSION = 18.2.1 ERLANG_SITE = http://www.erlang.org/download ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz ERLANG_DEPENDENCIES = host-erlang -ERLANG_LICENSE = EPL -ERLANG_LICENSE_FILES = EPLICENCE +ERLANG_LICENSE = Apache-2.0 +ERLANG_LICENSE_FILES = LICENSE.txt ERLANG_INSTALL_STAGING = YES -# Touching erts/configure.in +# Patched erts/aclocal.m4 ERLANG_AUTORECONF = YES # Whenever updating Erlang, this value should be updated as well, to the # value of EI_VSN in the file lib/erl_interface/vsn.mk -ERLANG_EI_VSN = 3.7.20 +ERLANG_EI_VSN = 3.8.1 # The configure checks for these functions fail incorrectly ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes From 6be72cd8ca093c53f17d1a5b982daf2cca800b11 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:28 -0500 Subject: [PATCH 069/206] pkg-rebar.mk: pass C++ compiler path and options Previously only the C compiler path and options were passed to rebar. Erlang projects that used the C++ compiler would fail to build, which would for example be the case with the latest version of erlang-p1-stringprep. This fixes those errors. Signed-off-by: Frank Hunleth Reviewed-by: Romain Naour [Thomas: adjust commit message to indicate an example of an Erlang package that needs the C++ compiler.] Signed-off-by: Thomas Petazzoni --- package/pkg-rebar.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-rebar.mk b/package/pkg-rebar.mk index c727489bef..44c6d6c8d2 100644 --- a/package/pkg-rebar.mk +++ b/package/pkg-rebar.mk @@ -158,7 +158,9 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS (cd $$(@D); \ CC="$$(TARGET_CC)" \ + CXX="$$(TARGET_CXX)" \ CFLAGS="$$(TARGET_CFLAGS)" \ + CXXFLAGS="$$(TARGET_CXXFLAGS)" \ LDFLAGS="$$(TARGET_LDFLAGS)" \ $$(REBAR_TARGET_DEPS_ENV) \ $$(TARGET_MAKE_ENV) \ From 532f0b136d18fde9042484030b51e0df05e5a529 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:29 -0500 Subject: [PATCH 070/206] erlang-goldrush: bump to version 0.1.8 Signed-off-by: Frank Hunleth Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/erlang-goldrush/erlang-goldrush.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/erlang-goldrush/erlang-goldrush.mk b/package/erlang-goldrush/erlang-goldrush.mk index b18a8ec483..2fa88107e1 100644 --- a/package/erlang-goldrush/erlang-goldrush.mk +++ b/package/erlang-goldrush/erlang-goldrush.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_GOLDRUSH_VERSION = 0.1.6 +ERLANG_GOLDRUSH_VERSION = 0.1.8 ERLANG_GOLDRUSH_SITE = $(call github,DeadZen,goldrush,$(ERLANG_GOLDRUSH_VERSION)) ERLANG_GOLDRUSH_LICENSE = ISC ERLANG_GOLDRUSH_LICENSE_FILES = LICENSE From b712f877ac482be4ea02582b09c23add1019c9af Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:30 -0500 Subject: [PATCH 071/206] erlang-lager: bump to version 2.2.0 Signed-off-by: Frank Hunleth Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/erlang-lager/erlang-lager.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/erlang-lager/erlang-lager.mk b/package/erlang-lager/erlang-lager.mk index b725bfd7bb..19940a9751 100644 --- a/package/erlang-lager/erlang-lager.mk +++ b/package/erlang-lager/erlang-lager.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_LAGER_VERSION = 2.0.3 +ERLANG_LAGER_VERSION = 2.2.0 ERLANG_LAGER_SITE = $(call github,basho,lager,$(ERLANG_LAGER_VERSION)) ERLANG_LAGER_LICENSE = Apache-2.0 ERLANG_LAGER_LICENSE_FILES = LICENSE From 530082e74047aec29d02d70bd4f65890d4d6b0b2 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:31 -0500 Subject: [PATCH 072/206] erlang-rebar: bump to version 2.6.1 Signed-off-by: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/erlang-rebar/erlang-rebar.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/erlang-rebar/erlang-rebar.mk b/package/erlang-rebar/erlang-rebar.mk index f29eb75697..06a780043a 100644 --- a/package/erlang-rebar/erlang-rebar.mk +++ b/package/erlang-rebar/erlang-rebar.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_REBAR_VERSION = 2.5.1 +ERLANG_REBAR_VERSION = 2.6.1 # Upstream publishes a release, but we can not use it as it is a release of # a generated rebar script, when we want the sources. So we have to use the From cc7257b264a9fbbe4eb236ed318a697ca11b87b3 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:32 -0500 Subject: [PATCH 073/206] erlang-fast_tls: new package This package is used by the newer versions of the ejabberd dependencies. Signed-off-by: Frank Hunleth Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/erlang-fast_tls/Config.in | 8 ++++++++ package/erlang-fast_tls/erlang-fast_tls.mk | 14 ++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 package/erlang-fast_tls/Config.in create mode 100644 package/erlang-fast_tls/erlang-fast_tls.mk diff --git a/package/Config.in b/package/Config.in index 8aa6bb50e8..422978f7ec 100644 --- a/package/Config.in +++ b/package/Config.in @@ -471,6 +471,7 @@ menu "Interpreter languages and scripting" source "package/erlang/Config.in" if BR2_PACKAGE_ERLANG menu "Erlang libraries/modules" + source "package/erlang-fast_tls/Config.in" source "package/erlang-goldrush/Config.in" source "package/erlang-lager/Config.in" source "package/erlang-p1-cache-tab/Config.in" diff --git a/package/erlang-fast_tls/Config.in b/package/erlang-fast_tls/Config.in new file mode 100644 index 0000000000..3bf52a1e88 --- /dev/null +++ b/package/erlang-fast_tls/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_ERLANG_FAST_TLS + bool "erlang-fast_tls" + select BR2_PACKAGE_ERLANG_P1_UTILS + select BR2_PACKAGE_OPENSSL + help + TLS / SSL OpenSSL-based native driver for Erlang / Elixir + + https://github.com/processone/fast_tls diff --git a/package/erlang-fast_tls/erlang-fast_tls.mk b/package/erlang-fast_tls/erlang-fast_tls.mk new file mode 100644 index 0000000000..63c55c5daa --- /dev/null +++ b/package/erlang-fast_tls/erlang-fast_tls.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# erlang-fast_tls +# +################################################################################ + +ERLANG_FAST_TLS_VERSION = 1.0.0 +ERLANG_FAST_TLS_SITE = $(call github,processone,fast_tls,$(ERLANG_FAST_TLS_VERSION)) +ERLANG_FAST_TLS_LICENSE = Apache-2.0 +ERLANG_FAST_TLS_LICENSE_FILES = LICENSE.txt +ERLANG_FAST_TLS_INSTALL_STAGING = YES +ERLANG_FAST_TLS_DEPENDENCIES = openssl erlang-p1-utils + +$(eval $(rebar-package)) From 05db2a14b9fcd113aeead908fbf561b5dba38226 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:33 -0500 Subject: [PATCH 074/206] erlang-p1-cache-tab: bump to version 1.0.1 Signed-off-by: Frank Hunleth Reviewed-by: Romain Naour [Thomas: change the license, it's now Apache-2.0.] Signed-off-by: Thomas Petazzoni --- package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk index 6c5d98a470..8f131237c6 100644 --- a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk +++ b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk @@ -4,10 +4,10 @@ # ################################################################################ -ERLANG_P1_CACHE_TAB_VERSION = f7ea12b +ERLANG_P1_CACHE_TAB_VERSION = 1.0.1 ERLANG_P1_CACHE_TAB_SITE = $(call github,processone,cache_tab,$(ERLANG_P1_CACHE_TAB_VERSION)) -ERLANG_P1_CACHE_TAB_LICENSE = GPLv2+ -ERLANG_P1_CACHE_TAB_LICENSE_FILES = COPYING +ERLANG_P1_CACHE_TAB_LICENSE = Apache-2.0 +ERLANG_P1_CACHE_TAB_LICENSE_FILES = LICENSE.txt ERLANG_P1_CACHE_TAB_DEPENDENCIES = erlang-p1-utils $(eval $(rebar-package)) From a42e850b05341a5883fd2d3af85ba90898b0872c Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:34 -0500 Subject: [PATCH 075/206] erlang-p1-iconv: bump to version 0.9.0 Signed-off-by: Frank Hunleth Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/erlang-p1-iconv/erlang-p1-iconv.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/erlang-p1-iconv/erlang-p1-iconv.mk b/package/erlang-p1-iconv/erlang-p1-iconv.mk index 2189f01c25..d2d2626d20 100644 --- a/package/erlang-p1-iconv/erlang-p1-iconv.mk +++ b/package/erlang-p1-iconv/erlang-p1-iconv.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_ICONV_VERSION = dff5ee5 +ERLANG_P1_ICONV_VERSION = 0.9.0 ERLANG_P1_ICONV_SITE = $(call github,processone,eiconv,$(ERLANG_P1_ICONV_VERSION)) ERLANG_P1_ICONV_LICENSE = GPLv2+ ERLANG_P1_ICONV_LICENSE_FILES = COPYING From 861ebf9111ab432857d6fbd98680bbf4996cfd07 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:35 -0500 Subject: [PATCH 076/206] erlang-p1-stringprep: bump to version 1.0.0 This version includes C++ code, so also add dependency on a C++ compiler. Signed-off-by: Frank Hunleth [Thomas: - propagate new C++ dependency to ejabberd, as noticed by Romain Naour - fix license information and license files. Not all the code is under the TCL license, in fact most of the code is under the Apache-2.0 license, and some additional license files have been added to clarify this.] Signed-off-by: Thomas Petazzoni --- package/ejabberd/Config.in | 5 +++-- package/erlang-p1-stringprep/Config.in | 4 ++++ package/erlang-p1-stringprep/erlang-p1-stringprep.mk | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package/ejabberd/Config.in b/package/ejabberd/Config.in index 7b4e99b791..5d176c3af6 100644 --- a/package/ejabberd/Config.in +++ b/package/ejabberd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_EJABBERD bool "ejabberd" depends on BR2_PACKAGE_ERLANG + depends on BR2_INSTALL_LIBSTDCPP # stringprep select BR2_PACKAGE_ERLANG_LAGER select BR2_PACKAGE_ERLANG_P1_CACHE_TAB select BR2_PACKAGE_ERLANG_P1_ICONV @@ -18,5 +19,5 @@ config BR2_PACKAGE_EJABBERD http://www.ejabberd.im -comment "ejabberd needs erlang" - depends on !BR2_PACKAGE_ERLANG +comment "ejabberd needs erlang, toolchain w/ C++" + depends on !BR2_PACKAGE_ERLANG || !BR2_INSTALL_LIBSTDCPP diff --git a/package/erlang-p1-stringprep/Config.in b/package/erlang-p1-stringprep/Config.in index 3ef77ed601..bc4d1394ef 100644 --- a/package/erlang-p1-stringprep/Config.in +++ b/package/erlang-p1-stringprep/Config.in @@ -1,5 +1,9 @@ +comment "erlang-p1-stringprep needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_ERLANG_P1_STRINGPREP bool "erlang-p1-stringprep" + depends on BR2_INSTALL_LIBSTDCPP help Erlang interface to stringprep diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk index 60c80bc06e..0a5a1f548d 100644 --- a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk +++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk @@ -4,9 +4,9 @@ # ################################################################################ -ERLANG_P1_STRINGPREP_VERSION = 3c64023 +ERLANG_P1_STRINGPREP_VERSION = 1.0.0 ERLANG_P1_STRINGPREP_SITE = $(call github,processone,stringprep,$(ERLANG_P1_STRINGPREP_VERSION)) -ERLANG_P1_STRINGPREP_LICENSE = TCL -ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.TCL +ERLANG_P1_STRINGPREP_LICENSE = TCL (tools/*.tcl), Apache-2.0 (rest) +ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.ALL LICENSE.TCL LICENSE.txt $(eval $(rebar-package)) From 86803492ec34ee3cb8f0abad51d3c23e7c5ba906 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Sat, 20 Feb 2016 18:53:36 +0100 Subject: [PATCH 077/206] erlang-p1-stun: bump to version 0.9.0 Signed-off-by: Frank Hunleth [Thomas: - do only the version bump, not the package rename, as suggested by Romain Naour - erlang-p1-stun continues to depend on erlang-p1-tls, not erlang-fast_tls.] Signed-off-by: Thomas Petazzoni --- package/erlang-p1-stun/erlang-p1-stun.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/erlang-p1-stun/erlang-p1-stun.mk b/package/erlang-p1-stun/erlang-p1-stun.mk index 7920347c59..4d26f917ee 100644 --- a/package/erlang-p1-stun/erlang-p1-stun.mk +++ b/package/erlang-p1-stun/erlang-p1-stun.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_STUN_VERSION = a3dce07 +ERLANG_P1_STUN_VERSION = 0.9.0 ERLANG_P1_STUN_SITE = $(call github,processone,stun,$(ERLANG_P1_STUN_VERSION)) ERLANG_P1_STUN_LICENSE = GPLv2+ ERLANG_P1_STUN_LICENSE_FILES = COPYING From 4f9f673233235fded27577c74295fc3ecf2e4804 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:37 -0500 Subject: [PATCH 078/206] erlang-p1-sip: bump to version 1.0.0 Signed-off-by: Frank Hunleth Reviewed-by: Romain Naour [Thomas: adjust erlang-p1-stun dependency since the package was not renamed.] Signed-off-by: Thomas Petazzoni --- package/erlang-p1-sip/erlang-p1-sip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/erlang-p1-sip/erlang-p1-sip.mk b/package/erlang-p1-sip/erlang-p1-sip.mk index d017a92289..24075a7ae1 100644 --- a/package/erlang-p1-sip/erlang-p1-sip.mk +++ b/package/erlang-p1-sip/erlang-p1-sip.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_SIP_VERSION = fd3e461 +ERLANG_P1_SIP_VERSION = 1.0.0 ERLANG_P1_SIP_SITE = $(call github,processone,p1_sip,$(ERLANG_P1_SIP_VERSION)) ERLANG_P1_SIP_LICENSE = GPLv2 with OpenSSL exception ERLANG_P1_SIP_LICENSE_FILES = COPYING From 345d3b300d963747599809a63c556fd13e811528 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:38 -0500 Subject: [PATCH 079/206] erlang-p1-tls: bump to version 1.0.0 Signed-off-by: Frank Hunleth Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/erlang-p1-tls/erlang-p1-tls.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/erlang-p1-tls/erlang-p1-tls.mk b/package/erlang-p1-tls/erlang-p1-tls.mk index 4f1fc48549..f7212c47e0 100644 --- a/package/erlang-p1-tls/erlang-p1-tls.mk +++ b/package/erlang-p1-tls/erlang-p1-tls.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_TLS_VERSION = b070004 +ERLANG_P1_TLS_VERSION = 1.0.0 ERLANG_P1_TLS_SITE = $(call github,processone,tls,$(ERLANG_P1_TLS_VERSION)) ERLANG_P1_TLS_LICENSE = GPLv2+ ERLANG_P1_TLS_LICENSE_FILES = COPYING From dc681779f6384a2639401c1deee77f0575ccabcf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 20 Feb 2016 18:56:36 +0100 Subject: [PATCH 080/206] erlang-p1-tls: indicate OpenSSL exception in license info The license of erlang-p1-tls is indeed GPLv2+ as indicated in ERLANG_P1_TLS_LICENSE, but this GPLv2+ carries an OpenSSL exception, which allows it to be linked against the OpenSSL library. Therefore, we update the license information accordingly. Signed-off-by: Thomas Petazzoni --- package/erlang-p1-tls/erlang-p1-tls.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/erlang-p1-tls/erlang-p1-tls.mk b/package/erlang-p1-tls/erlang-p1-tls.mk index f7212c47e0..77f06e6b4d 100644 --- a/package/erlang-p1-tls/erlang-p1-tls.mk +++ b/package/erlang-p1-tls/erlang-p1-tls.mk @@ -6,7 +6,7 @@ ERLANG_P1_TLS_VERSION = 1.0.0 ERLANG_P1_TLS_SITE = $(call github,processone,tls,$(ERLANG_P1_TLS_VERSION)) -ERLANG_P1_TLS_LICENSE = GPLv2+ +ERLANG_P1_TLS_LICENSE = GPLv2+ with OpenSSL exception ERLANG_P1_TLS_LICENSE_FILES = COPYING ERLANG_P1_TLS_INSTALL_STAGING = YES ERLANG_P1_TLS_DEPENDENCIES = openssl From 6373adea3fa3863b5c467c8a5a0c427772733234 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:39 -0500 Subject: [PATCH 081/206] erlang-p1-utils: bump to version 1.0.3 Signed-off-by: Frank Hunleth Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/erlang-p1-utils/erlang-p1-utils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-utils/erlang-p1-utils.mk b/package/erlang-p1-utils/erlang-p1-utils.mk index c01d6d5024..733cf87f36 100644 --- a/package/erlang-p1-utils/erlang-p1-utils.mk +++ b/package/erlang-p1-utils/erlang-p1-utils.mk @@ -4,10 +4,10 @@ # ################################################################################ -ERLANG_P1_UTILS_VERSION = 1bf99f9 +ERLANG_P1_UTILS_VERSION = 1.0.3 ERLANG_P1_UTILS_SITE = $(call github,processone,p1_utils,$(ERLANG_P1_UTILS_VERSION)) ERLANG_P1_UTILS_LICENSE = GPLv2+ -ERLANG_P1_UTILS_LICENSE_FILES = COPYING +ERLANG_P1_UTILS_LICENSE_FILES = LICENSE.txt ERLANG_P1_UTILS_INSTALL_STAGING = YES $(eval $(rebar-package)) From 2a39cbd932ba15594322fe0020e3798d183916d9 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:40 -0500 Subject: [PATCH 082/206] erlang-p1-xml: bump to version 1.1.1 Signed-off-by: Frank Hunleth [Thomas: - add dependency on erlang-p1-utils, as noticed by Romain Naour. - the license is now Apache-2.0 and no longer GPLv2+.] Signed-off-by: Thomas Petazzoni --- package/erlang-p1-xml/Config.in | 1 + package/erlang-p1-xml/erlang-p1-xml.mk | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/erlang-p1-xml/Config.in b/package/erlang-p1-xml/Config.in index a6f4bd7e51..504501d912 100644 --- a/package/erlang-p1-xml/Config.in +++ b/package/erlang-p1-xml/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ERLANG_P1_XML bool "erlang-p1-xml" + select BR2_PACKAGE_ERLANG_P1_UTILS select BR2_PACKAGE_EXPAT help XML utilities for Erlang diff --git a/package/erlang-p1-xml/erlang-p1-xml.mk b/package/erlang-p1-xml/erlang-p1-xml.mk index f81d3e5496..31bab2311d 100644 --- a/package/erlang-p1-xml/erlang-p1-xml.mk +++ b/package/erlang-p1-xml/erlang-p1-xml.mk @@ -4,11 +4,11 @@ # ################################################################################ -ERLANG_P1_XML_VERSION = 2c61083 +ERLANG_P1_XML_VERSION = 1.1.1 ERLANG_P1_XML_SITE = $(call github,processone,xml,$(ERLANG_P1_XML_VERSION)) -ERLANG_P1_XML_LICENSE = GPLv2+ -ERLANG_P1_XML_LICENSE_FILES = COPYING -ERLANG_P1_XML_DEPENDENCIES = expat +ERLANG_P1_XML_LICENSE = Apache-2.0 +ERLANG_P1_XML_LICENSE_FILES = LICENSE.txt +ERLANG_P1_XML_DEPENDENCIES = expat erlang-p1-utils ERLANG_P1_XML_INSTALL_STAGING = YES ERLANG_P1_XML_USE_AUTOCONF = YES From 9ab8937ba5d449be46af3b6e0041364e1968a9a1 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:41 -0500 Subject: [PATCH 083/206] erlang-p1-yaml: bump to version 1.0.0 Signed-off-by: Frank Hunleth [Thomas: add dependency on erlang-p1-utils, as noticed by Romain Naour.] Signed-off-by: Thomas Petazzoni --- package/erlang-p1-yaml/Config.in | 1 + package/erlang-p1-yaml/erlang-p1-yaml.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-yaml/Config.in b/package/erlang-p1-yaml/Config.in index 25c9b02f7f..2ab78d1296 100644 --- a/package/erlang-p1-yaml/Config.in +++ b/package/erlang-p1-yaml/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ERLANG_P1_YAML bool "erlang-p1-yaml" + select BR2_PACKAGE_ERLANG_P1_UTILS select BR2_PACKAGE_LIBYAML help Erlang wrapper for libyaml C library diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.mk b/package/erlang-p1-yaml/erlang-p1-yaml.mk index 6f7c97736b..22fcda43f8 100644 --- a/package/erlang-p1-yaml/erlang-p1-yaml.mk +++ b/package/erlang-p1-yaml/erlang-p1-yaml.mk @@ -4,10 +4,10 @@ # ################################################################################ -ERLANG_P1_YAML_VERSION = e1f081e +ERLANG_P1_YAML_VERSION = 1.0.0 ERLANG_P1_YAML_SITE = $(call github,processone,p1_yaml,$(ERLANG_P1_YAML_VERSION)) ERLANG_P1_YAML_LICENSE = Apache-2.0 ERLANG_P1_YAML_LICENSE_FILES = COPYING -ERLANG_P1_YAML_DEPENDENCIES = libyaml +ERLANG_P1_YAML_DEPENDENCIES = libyaml erlang-p1-utils $(eval $(rebar-package)) From 715b24c153436cd92539cf69cc765aea816e96fc Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 2 Feb 2016 14:57:42 -0500 Subject: [PATCH 084/206] erlang-p1-zlib: bump to version 1.0.0 Signed-off-by: Frank Hunleth Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/erlang-p1-zlib/erlang-p1-zlib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.mk b/package/erlang-p1-zlib/erlang-p1-zlib.mk index 4ba3332e34..1f8ae0063d 100644 --- a/package/erlang-p1-zlib/erlang-p1-zlib.mk +++ b/package/erlang-p1-zlib/erlang-p1-zlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_ZLIB_VERSION = 52e82bb +ERLANG_P1_ZLIB_VERSION = 1.0.0 ERLANG_P1_ZLIB_SITE = $(call github,processone,zlib,$(ERLANG_P1_ZLIB_VERSION)) ERLANG_P1_ZLIB_LICENSE = GPLv2+ ERLANG_P1_ZLIB_LICENSE_FILES = COPYING From ff370f7a69b17a7dbe9b9d8dcc530c2a8ab3da18 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Jan 2016 14:25:44 +0100 Subject: [PATCH 085/206] package/kexec: bump version to 2.0.11 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kexec/kexec.hash | 2 +- package/kexec/kexec.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index fa2d8be875..24a71e7a45 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 8ae34a9ceb76350954e1e1e3ca9ab51da15862bd5f2fd14392208e60fb454f71 kexec-tools-2.0.9.tar.xz +sha256 b1097986ffdb928cf41a94e8a5dfddc981a8fa710cccf13298e7f8dd939a2ee3 kexec-tools-2.0.11.tar.xz diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index d1584069ef..d27c514f71 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.9 +KEXEC_VERSION = 2.0.11 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPLv2 From ae047147e8a08a769ab5491b1aa00db57645e458 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Jan 2016 14:25:45 +0100 Subject: [PATCH 086/206] package/kexec: Fix musl build issue related to loff_t Fixes http://autobuild.buildroot.net/results/c19/c19a016b7fd50b8cef110e70e6f3af7cd0369368/ [Peter: extend commit message] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...0001-vmcore-dmesg-Define-_GNU_SOURCE.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/kexec/0001-vmcore-dmesg-Define-_GNU_SOURCE.patch diff --git a/package/kexec/0001-vmcore-dmesg-Define-_GNU_SOURCE.patch b/package/kexec/0001-vmcore-dmesg-Define-_GNU_SOURCE.patch new file mode 100644 index 0000000000..adaac2f6ec --- /dev/null +++ b/package/kexec/0001-vmcore-dmesg-Define-_GNU_SOURCE.patch @@ -0,0 +1,38 @@ +Fix musl build + +Downloaded from http://patchwork.openembedded.org/patch/112685/ + +Signed-off-by: Bernd Kuhls + + +From d811875a41b4628040abaada3da29b7b9592e757 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 9 Jan 2016 17:16:16 -0800 +Subject: [PATCH] vmcore-dmesg: Define _GNU_SOURCE + +loff_t is guarded with _GNU_SOURCE on some C library implementations +e.g. musl since this type is not defined by POSIX. Define _GNU_SOURCE to +include this define, it should help compiling on musl while nothing +changes for glibc based systems since there _GNU_SOURCE is already +defined + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + vmcore-dmesg/vmcore-dmesg.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c +index 0364636..a8f56df 100644 +--- a/vmcore-dmesg/vmcore-dmesg.c ++++ b/vmcore-dmesg/vmcore-dmesg.c +@@ -1,4 +1,5 @@ + #define _XOPEN_SOURCE 600 ++#define _GNU_SOURCE + #define _LARGEFILE_SOURCE 1 + #define _FILE_OFFSET_BITS 64 + #include +-- +2.7.0 + From 9dd344a44f41eadb464f0857ac290342fc379f2d Mon Sep 17 00:00:00 2001 From: Olivier Schonken Date: Sun, 24 Jan 2016 21:49:33 +0200 Subject: [PATCH 087/206] package/gutenprint: Un-deprecate and bump version to 5.2.11 Signed-off-by: Olivier Schonken [Thomas: add missing dependency of host-gutenprint on host-pkgconf, needed since configure.ac uses PKG_CHECK_MODULES and the package is autoreconfigured.] Signed-off-by: Thomas Petazzoni --- ...t-olympus.c-fix-endianness-detection.patch | 33 +++++++++++++++++++ package/gutenprint/Config.in | 2 -- package/gutenprint/gutenprint.hash | 2 +- package/gutenprint/gutenprint.mk | 5 ++- 4 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 package/gutenprint/0003-print-olympus.c-fix-endianness-detection.patch diff --git a/package/gutenprint/0003-print-olympus.c-fix-endianness-detection.patch b/package/gutenprint/0003-print-olympus.c-fix-endianness-detection.patch new file mode 100644 index 0000000000..fc1746ca00 --- /dev/null +++ b/package/gutenprint/0003-print-olympus.c-fix-endianness-detection.patch @@ -0,0 +1,33 @@ +From e0dad4bb237f1155e920c30c6fd3412e96a3e84d Mon Sep 17 00:00:00 2001 +From: Olivier Schonken +Date: Sun, 24 Jan 2016 17:14:21 +0200 +Subject: [PATCH 1/1] print-olympus.c: fix endianness detection + +The __LITTLE_ENDIAN__ and __BIG_ENDIAN__ macros are not a reliable way to +detect endianness. Instead, rely on __BYTE_ORDER like we do in the rest of +the code. + +Signed-off-by: Olivier Schonken +--- + src/main/print-olympus.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c +index 42c4897..8b2aa80 100644 +--- a/src/main/print-olympus.c ++++ b/src/main/print-olympus.c +@@ -4901,9 +4901,9 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image) + } + + if (pv.bytes_per_ink_channel > 1) { +-#if defined(__LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN__) ++#if (__BYTE_ORDER == __LITTLE_ENDIAN) + pv.byteswap = dyesub_feature(caps, DYESUB_FEATURE_BIGENDIAN); +-#elif defined (__BIG_ENDIAN) || defined(__BIG_ENDIAN__) ++#elif (__BYTE_ORDER == __BIG_ENDIAN) + pv.byteswap = !dyesub_feature(caps, DYESUB_FEATURE_BIGENDIAN); + #else + #error "Unable to determine endianness, aborting compilation!" +-- +1.9.1 + diff --git a/package/gutenprint/Config.in b/package/gutenprint/Config.in index 686dbce58e..f93717c7f2 100644 --- a/package/gutenprint/Config.in +++ b/package/gutenprint/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_GUTENPRINT bool "gutenprint" - # because of cups security issues - depends on BR2_DEPRECATED_SINCE_2015_05 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_CUPS select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE diff --git a/package/gutenprint/gutenprint.hash b/package/gutenprint/gutenprint.hash index 3cfe0e1188..a52cc7d42d 100644 --- a/package/gutenprint/gutenprint.hash +++ b/package/gutenprint/gutenprint.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 4b27e4f06f32d30271df89ecb6089bb11bcf2caec5f60b0909e083095354bca0 gutenprint-5.2.9.tar.bz2 +sha256 c1a34cd2e02527de4d2a9bf6c14732cb9aa11b333f771eb6043fdc974de24df9 gutenprint-5.2.11.tar.bz2 diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk index 3ff05b60e6..7e3024d400 100644 --- a/package/gutenprint/gutenprint.mk +++ b/package/gutenprint/gutenprint.mk @@ -5,7 +5,7 @@ ################################################################################ GUTENPRINT_VERSION_MAJOR = 5.2 -GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).9 +GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).11 GUTENPRINT_SITE = http://downloads.sourceforge.net/project/gimp-print/gutenprint-$(GUTENPRINT_VERSION_MAJOR)/$(GUTENPRINT_VERSION) GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2 GUTENPRINT_LICENSE = GPLv2+ @@ -44,8 +44,7 @@ GUTENPRINT_CONF_OPTS = \ # USE_PREGEN_XMLI18N_TMP_H is added by our patch GUTENPRINT_MAKE_ENV = BR2_USE_PREGEN_XMLI18N_TMP_H=$(HOST_DIR)/usr/include/xmli18n-tmp.h -# We have no host dependencies -HOST_GUTENPRINT_DEPENDENCIES = +HOST_GUTENPRINT_DEPENDENCIES = host-pkgconf # The host-gutenprint shall create the required header HOST_GUTENPRINT_MAKE_ENV = From 0c05e97b3360148e90c63557e5ae1e2d95146479 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 21 Feb 2016 00:21:50 +0100 Subject: [PATCH 088/206] package/libeXosip2: renumber patch Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...-openssl.patch => 0001-use-pkg-config-to-detect-openssl.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/libeXosip2/{0002-use-pkg-config-to-detect-openssl.patch => 0001-use-pkg-config-to-detect-openssl.patch} (100%) diff --git a/package/libeXosip2/0002-use-pkg-config-to-detect-openssl.patch b/package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch similarity index 100% rename from package/libeXosip2/0002-use-pkg-config-to-detect-openssl.patch rename to package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch From 2511024c8135b57891f7eb540c5523749d26d647 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Sun, 21 Feb 2016 14:09:14 +0100 Subject: [PATCH 089/206] collectd: Fix typo Signed-off-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/collectd/collectd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 06c5389fe8..eb66f2563e 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -16,7 +16,7 @@ COLLECTD_LICENSE_FILES = COPYING COLLECTD_PLUGINS_DISABLE = \ amqp apple_sensors aquaero ascent barometer dbi email \ gmond hddtemp ipmi java libvirt lpar lvm madwifi mbmon \ - mic multimeter netapp notify_desktop notify_email numa \ + mic multimeter netapp notify_desktop notify_email numa \ nut onewire oracle perl pf pinba powerdns python redis routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ tokyotyrant turbostat uuid varnish virt vserver write_kafka \ From 7f18274a92e4db5c4cac1c248a40cbd3be91db7d Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Sun, 21 Feb 2016 14:09:15 +0100 Subject: [PATCH 090/206] collectd: Add service file The service file was taken from Debian. Signed-off-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/collectd/collectd.mk | 8 ++++++++ package/collectd/collectd.service | 17 +++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 package/collectd/collectd.service diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index eb66f2563e..78e24b8a0f 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -185,4 +185,12 @@ define COLLECTD_INSTALL_TARGET_CMDS rm -f $(TARGET_DIR)/usr/share/collectd/postgresql_default.conf endef +define COLLECTD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/collectd/collectd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/collectd.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -fs ../../../../usr/lib/systemd/system/collectd.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/collectd.service +endef + $(eval $(autotools-package)) diff --git a/package/collectd/collectd.service b/package/collectd/collectd.service new file mode 100644 index 0000000000..e203806f59 --- /dev/null +++ b/package/collectd/collectd.service @@ -0,0 +1,17 @@ +[Unit] +Description=Statistics collection and monitoring daemon +After=local-fs.target network.target +Requires=local-fs.target network.target +ConditionPathExists=/etc/collectd.conf + +[Service] +Type=notify +NotifyAccess=main +EnvironmentFile=-/etc/default/collectd +ExecStartPre=/usr/sbin/collectd -t +ExecStart=/usr/sbin/collectd +Restart=always +RestartSec=10 + +[Install] +WantedBy=multi-user.target From 907844645313bd6e1404e2d6a4826c775e6c3460 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 21:28:09 +0100 Subject: [PATCH 091/206] package/libdrm: bump version to 2.4.67 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libdrm/libdrm.hash | 4 ++-- package/libdrm/libdrm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index 948c7bf340..8e3104c1c9 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,2 +1,2 @@ -# From http://lists.freedesktop.org/archives/dri-devel/2015-December/097697.html -sha256 79cb8e988749794edfb2d777b298d5292eff353bbbb71ed813589e61d2bc2d76 libdrm-2.4.66.tar.bz2 +# From https://lists.freedesktop.org/archives/dri-devel/2016-February/100859.html +sha256 ee5b71e1113be37544d0752681c12f040c01f782e2933df7d7bc21fd0d10cebe libdrm-2.4.67.tar.bz2 diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 8d84beb2cf..99a78d2df3 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.66 +LIBDRM_VERSION = 2.4.67 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 LIBDRM_SITE = http://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From 1ded02f0b2cdad55a554e7d438fa9f2bd1fe4059 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 18 Feb 2016 11:39:51 -0800 Subject: [PATCH 092/206] libaio: bump version to 0.3.110 Update libaio from 0.3.108 to 0.3.110. This adds AArch64 support. The 0001-arches.patch is simplified to only add MIPS definitions: the SPARC support has been merged upstream, and we don't need the m68k and parisc support. Signed-off-by: Alistair Francis [Thomas: - respect alphabetic ordering in the definition of BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS - add more details in the commit log.] Signed-off-by: Thomas Petazzoni --- package/libaio/0001-arches.patch | 454 ++----------------------------- package/libaio/Config.in | 2 +- package/libaio/libaio.hash | 4 +- package/libaio/libaio.mk | 2 +- 4 files changed, 20 insertions(+), 442 deletions(-) diff --git a/package/libaio/0001-arches.patch b/package/libaio/0001-arches.patch index c85568cad3..4b77f57768 100644 --- a/package/libaio/0001-arches.patch +++ b/package/libaio/0001-arches.patch @@ -1,145 +1,28 @@ Patch borrowed from OpenEmbedded, available at -recipes/libaio/libaio-0.3.106/00_arches.patch in their source -tree. The patch has been adapted to remove the ARM-related -definitions, since they have been merged in later versions of libaio. +/meta/recipes-extended/libaio/libaio/00_arches.patch in their source +tree. This patch has been modified to only add the MIPS definitions. -The patch adds various architecture specific definitions (syscall -number and macros) for m68k, MIPS, PA/RISC and Sparc. Amongst these, -Buildroot mostly only cares about MIPS, but it was just easier to take -the whole OpenEmbedded patch. +The patch adds MIPS specific definitions (syscall number and macros). -Signed-off-by: Thomas Petazzoni ---- - src/libaio.h | 24 +++++ - src/syscall-m68k.h | 78 +++++++++++++++++ - src/syscall-mips.h | 223 +++++++++++++++++++++++++++++++++++++++++++++++++++ - src/syscall-parisc.h | 146 +++++++++++++++++++++++++++++++++ - src/syscall-sparc.h | 130 +++++++++++++++++++++++++++++ - src/syscall.h | 8 + - 7 files changed, 725 insertions(+) +Signed-off-by: Alistair Francis -Index: libaio-0.3.109/src/libaio.h +Index: libaio-0.3.110/src/syscall.h =================================================================== ---- libaio-0.3.109.orig/src/libaio.h -+++ libaio-0.3.109/src/libaio.h -@@ -83,6 +83,30 @@ - #define PADDEDptr(x, y) x; unsigned y - #define PADDEDul(x, y) unsigned long x; unsigned y - # endif -+#elif defined(__m68k__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__sparc__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__hppa__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x +--- libaio-0.3.110.orig/src/syscall.h ++++ libaio-0.3.110/src/syscall.h +@@ -28,6 +28,8 @@ + #include "syscall-sparc.h" + #elif defined(__aarch64__) + #include "syscall-arm64.h" +#elif defined(__mips__) -+# if defined (__MIPSEB__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+# elif defined(__MIPSEL__) /* little endian, 32 bits */ -+#define PADDED(x, y) x; unsigned y -+#define PADDEDptr(x, y) x; unsigned y -+#define PADDEDul(x, y) unsigned long x; unsigned y -+# else -+# error "neither mipseb nor mipsel?" -+# endif ++#include "syscall-mips.h" #else - #error endian? - #endif -Index: libaio-0.3.109/src/syscall-m68k.h + #warning "using generic syscall method" + #include "syscall-generic.h" +Index: libaio-0.3.110/src/syscall-mips.h =================================================================== --- /dev/null -+++ libaio-0.3.109/src/syscall-m68k.h -@@ -0,0 +1,78 @@ -+#define __NR_io_setup 241 -+#define __NR_io_destroy 242 -+#define __NR_io_getevents 243 -+#define __NR_io_submit 244 -+#define __NR_io_cancel 245 -+ -+#define io_syscall1(type,fname,sname,atype,a) \ -+type fname(atype a) \ -+{ \ -+register long __res __asm__ ("%d0") = __NR_##sname; \ -+register long __a __asm__ ("%d1") = (long)(a); \ -+__asm__ __volatile__ ("trap #0" \ -+ : "+d" (__res) \ -+ : "d" (__a) ); \ -+return (type) __res; \ -+} -+ -+#define io_syscall2(type,fname,sname,atype,a,btype,b) \ -+type fname(atype a,btype b) \ -+{ \ -+register long __res __asm__ ("%d0") = __NR_##sname; \ -+register long __a __asm__ ("%d1") = (long)(a); \ -+register long __b __asm__ ("%d2") = (long)(b); \ -+__asm__ __volatile__ ("trap #0" \ -+ : "+d" (__res) \ -+ : "d" (__a), "d" (__b) \ -+ ); \ -+return (type) __res; \ -+} -+ -+#define io_syscall3(type,fname,sname,atype,a,btype,b,ctype,c) \ -+type fname(atype a,btype b,ctype c) \ -+{ \ -+register long __res __asm__ ("%d0") = __NR_##sname; \ -+register long __a __asm__ ("%d1") = (long)(a); \ -+register long __b __asm__ ("%d2") = (long)(b); \ -+register long __c __asm__ ("%d3") = (long)(c); \ -+__asm__ __volatile__ ("trap #0" \ -+ : "+d" (__res) \ -+ : "d" (__a), "d" (__b), \ -+ "d" (__c) \ -+ ); \ -+return (type) __res; \ -+} -+ -+#define io_syscall4(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d) \ -+type fname (atype a, btype b, ctype c, dtype d) \ -+{ \ -+register long __res __asm__ ("%d0") = __NR_##sname; \ -+register long __a __asm__ ("%d1") = (long)(a); \ -+register long __b __asm__ ("%d2") = (long)(b); \ -+register long __c __asm__ ("%d3") = (long)(c); \ -+register long __d __asm__ ("%d4") = (long)(d); \ -+__asm__ __volatile__ ("trap #0" \ -+ : "+d" (__res) \ -+ : "d" (__a), "d" (__b), \ -+ "d" (__c), "d" (__d) \ -+ ); \ -+return (type) __res; \ -+} -+ -+#define io_syscall5(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d,etype,e) \ -+type fname (atype a,btype b,ctype c,dtype d,etype e) \ -+{ \ -+register long __res __asm__ ("%d0") = __NR_##sname; \ -+register long __a __asm__ ("%d1") = (long)(a); \ -+register long __b __asm__ ("%d2") = (long)(b); \ -+register long __c __asm__ ("%d3") = (long)(c); \ -+register long __d __asm__ ("%d4") = (long)(d); \ -+register long __e __asm__ ("%d5") = (long)(e); \ -+__asm__ __volatile__ ("trap #0" \ -+ : "+d" (__res) \ -+ : "d" (__a), "d" (__b), \ -+ "d" (__c), "d" (__d), "d" (__e) \ -+ ); \ -+return (type) __res; \ -+} -+ -Index: libaio-0.3.109/src/syscall-mips.h -=================================================================== ---- /dev/null -+++ libaio-0.3.109/src/syscall-mips.h ++++ libaio-0.3.110/src/syscall-mips.h @@ -0,0 +1,223 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -364,308 +247,3 @@ Index: libaio-0.3.109/src/syscall-mips.h + +#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */ + -Index: libaio-0.3.109/src/syscall-parisc.h -=================================================================== ---- /dev/null -+++ libaio-0.3.109/src/syscall-parisc.h -@@ -0,0 +1,146 @@ -+/* -+ * Linux system call numbers. -+ * -+ * Cary Coutant says that we should just use another syscall gateway -+ * page to avoid clashing with the HPUX space, and I think he's right: -+ * it will would keep a branch out of our syscall entry path, at the -+ * very least. If we decide to change it later, we can ``just'' tweak -+ * the LINUX_GATEWAY_ADDR define at the bottom and make __NR_Linux be -+ * 1024 or something. Oh, and recompile libc. =) -+ * -+ * 64-bit HPUX binaries get the syscall gateway address passed in a register -+ * from the kernel at startup, which seems a sane strategy. -+ */ -+ -+#define __NR_Linux 0 -+#define __NR_io_setup (__NR_Linux + 215) -+#define __NR_io_destroy (__NR_Linux + 216) -+#define __NR_io_getevents (__NR_Linux + 217) -+#define __NR_io_submit (__NR_Linux + 218) -+#define __NR_io_cancel (__NR_Linux + 219) -+ -+#define SYS_ify(syscall_name) __NR_##syscall_name -+ -+/* Assume all syscalls are done from PIC code just to be -+ * safe. The worst case scenario is that you lose a register -+ * and save/restore r19 across the syscall. */ -+#define PIC -+ -+/* Definition taken from glibc 2.3.3 -+ * sysdeps/unix/sysv/linux/hppa/sysdep.h -+ */ -+ -+#ifdef PIC -+/* WARNING: CANNOT BE USED IN A NOP! */ -+# define K_STW_ASM_PIC " copy %%r19, %%r4\n" -+# define K_LDW_ASM_PIC " copy %%r4, %%r19\n" -+# define K_USING_GR4 "%r4", -+#else -+# define K_STW_ASM_PIC " \n" -+# define K_LDW_ASM_PIC " \n" -+# define K_USING_GR4 -+#endif -+ -+/* GCC has to be warned that a syscall may clobber all the ABI -+ registers listed as "caller-saves", see page 8, Table 2 -+ in section 2.2.6 of the PA-RISC RUN-TIME architecture -+ document. However! r28 is the result and will conflict with -+ the clobber list so it is left out. Also the input arguments -+ registers r20 -> r26 will conflict with the list so they -+ are treated specially. Although r19 is clobbered by the syscall -+ we cannot say this because it would violate ABI, thus we say -+ r4 is clobbered and use that register to save/restore r19 -+ across the syscall. */ -+ -+#define K_CALL_CLOB_REGS "%r1", "%r2", K_USING_GR4 \ -+ "%r20", "%r29", "%r31" -+ -+#undef K_INLINE_SYSCALL -+#define K_INLINE_SYSCALL(name, nr, args...) ({ \ -+ long __sys_res; \ -+ { \ -+ register unsigned long __res __asm__("r28"); \ -+ K_LOAD_ARGS_##nr(args) \ -+ /* FIXME: HACK stw/ldw r19 around syscall */ \ -+ __asm__ volatile( \ -+ K_STW_ASM_PIC \ -+ " ble 0x100(%%sr2, %%r0)\n" \ -+ " ldi %1, %%r20\n" \ -+ K_LDW_ASM_PIC \ -+ : "=r" (__res) \ -+ : "i" (SYS_ify(name)) K_ASM_ARGS_##nr \ -+ : "memory", K_CALL_CLOB_REGS K_CLOB_ARGS_##nr \ -+ ); \ -+ __sys_res = (long)__res; \ -+ } \ -+ __sys_res; \ -+}) -+ -+#define K_LOAD_ARGS_0() -+#define K_LOAD_ARGS_1(r26) \ -+ register unsigned long __r26 __asm__("r26") = (unsigned long)(r26); \ -+ K_LOAD_ARGS_0() -+#define K_LOAD_ARGS_2(r26,r25) \ -+ register unsigned long __r25 __asm__("r25") = (unsigned long)(r25); \ -+ K_LOAD_ARGS_1(r26) -+#define K_LOAD_ARGS_3(r26,r25,r24) \ -+ register unsigned long __r24 __asm__("r24") = (unsigned long)(r24); \ -+ K_LOAD_ARGS_2(r26,r25) -+#define K_LOAD_ARGS_4(r26,r25,r24,r23) \ -+ register unsigned long __r23 __asm__("r23") = (unsigned long)(r23); \ -+ K_LOAD_ARGS_3(r26,r25,r24) -+#define K_LOAD_ARGS_5(r26,r25,r24,r23,r22) \ -+ register unsigned long __r22 __asm__("r22") = (unsigned long)(r22); \ -+ K_LOAD_ARGS_4(r26,r25,r24,r23) -+#define K_LOAD_ARGS_6(r26,r25,r24,r23,r22,r21) \ -+ register unsigned long __r21 __asm__("r21") = (unsigned long)(r21); \ -+ K_LOAD_ARGS_5(r26,r25,r24,r23,r22) -+ -+/* Even with zero args we use r20 for the syscall number */ -+#define K_ASM_ARGS_0 -+#define K_ASM_ARGS_1 K_ASM_ARGS_0, "r" (__r26) -+#define K_ASM_ARGS_2 K_ASM_ARGS_1, "r" (__r25) -+#define K_ASM_ARGS_3 K_ASM_ARGS_2, "r" (__r24) -+#define K_ASM_ARGS_4 K_ASM_ARGS_3, "r" (__r23) -+#define K_ASM_ARGS_5 K_ASM_ARGS_4, "r" (__r22) -+#define K_ASM_ARGS_6 K_ASM_ARGS_5, "r" (__r21) -+ -+/* The registers not listed as inputs but clobbered */ -+#define K_CLOB_ARGS_6 -+#define K_CLOB_ARGS_5 K_CLOB_ARGS_6, "%r21" -+#define K_CLOB_ARGS_4 K_CLOB_ARGS_5, "%r22" -+#define K_CLOB_ARGS_3 K_CLOB_ARGS_4, "%r23" -+#define K_CLOB_ARGS_2 K_CLOB_ARGS_3, "%r24" -+#define K_CLOB_ARGS_1 K_CLOB_ARGS_2, "%r25" -+#define K_CLOB_ARGS_0 K_CLOB_ARGS_1, "%r26" -+ -+#define io_syscall1(type,fname,sname,type1,arg1) \ -+type fname(type1 arg1) \ -+{ \ -+ return K_INLINE_SYSCALL(sname, 1, arg1); \ -+} -+ -+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -+type fname(type1 arg1, type2 arg2) \ -+{ \ -+ return K_INLINE_SYSCALL(sname, 2, arg1, arg2); \ -+} -+ -+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ -+type fname(type1 arg1, type2 arg2, type3 arg3) \ -+{ \ -+ return K_INLINE_SYSCALL(sname, 3, arg1, arg2, arg3); \ -+} -+ -+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ -+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ -+{ \ -+ return K_INLINE_SYSCALL(sname, 4, arg1, arg2, arg3, arg4); \ -+} -+ -+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \ -+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \ -+{ \ -+ return K_INLINE_SYSCALL(sname, 5, arg1, arg2, arg3, arg4, arg5); \ -+} -+ -Index: libaio-0.3.109/src/syscall-sparc.h -=================================================================== ---- /dev/null -+++ libaio-0.3.109/src/syscall-sparc.h -@@ -0,0 +1,130 @@ -+/* $Id: unistd.h,v 1.74 2002/02/08 03:57:18 davem Exp $ */ -+ -+/* -+ * System calls under the Sparc. -+ * -+ * Don't be scared by the ugly clobbers, it is the only way I can -+ * think of right now to force the arguments into fixed registers -+ * before the trap into the system call with gcc 'asm' statements. -+ * -+ * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) -+ * -+ * SunOS compatibility based upon preliminary work which is: -+ * -+ * Copyright (C) 1995 Adrian M. Rodriguez (adrian@remus.rutgers.edu) -+ */ -+ -+ -+#define __NR_io_setup 268 -+#define __NR_io_destroy 269 -+#define __NR_io_submit 270 -+#define __NR_io_cancel 271 -+#define __NR_io_getevents 272 -+ -+ -+#define io_syscall1(type,fname,sname,type1,arg1) \ -+type fname(type1 arg1) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res >= 0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ -+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -+type fname(type1 arg1,type2 arg2) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res >= 0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ -+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ -+type fname(type1 arg1,type2 arg2,type3 arg3) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ -+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ -+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+register long __o3 __asm__ ("o3") = (long)(arg4); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ -+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ -+ type5,arg5) \ -+type fname(type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+register long __o3 __asm__ ("o3") = (long)(arg4); \ -+register long __o4 __asm__ ("o4") = (long)(arg5); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ -Index: libaio-0.3.109/src/syscall.h -=================================================================== ---- libaio-0.3.109.orig/src/syscall.h -+++ libaio-0.3.109/src/syscall.h -@@ -24,6 +24,14 @@ - #include "syscall-alpha.h" - #elif defined(__arm__) - #include "syscall-arm.h" -+#elif defined(__m68k__) -+#include "syscall-m68k.h" -+#elif defined(__sparc__) -+#include "syscall-sparc.h" -+#elif defined(__hppa__) -+#include "syscall-parisc.h" -+#elif defined(__mips__) -+#include "syscall-mips.h" - #else - #error "add syscall-arch.h" - #endif diff --git a/package/libaio/Config.in b/package/libaio/Config.in index cc44cb6dbc..3031c894b7 100644 --- a/package/libaio/Config.in +++ b/package/libaio/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS bool - default y if BR2_arm || BR2_armeb || BR2_i386 || \ + default y if BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ BR2_m68k || BR2_mips || BR2_mipsel || BR2_powerpc || \ BR2_sparc || BR2_x86_64 diff --git a/package/libaio/libaio.hash b/package/libaio/libaio.hash index deb16e86ad..7aa8961fbf 100644 --- a/package/libaio/libaio.hash +++ b/package/libaio/libaio.hash @@ -1,2 +1,2 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/liba/libaio/libaio_0.3.109-3.dsc -sha256 bf4a457253cbaab215aea75cb6e18dc8d95bbd507e9920661ff9bdd288c8778d libaio_0.3.109.orig.tar.gz +# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/liba/libaio/libaio_0.3.110-1.dsc +sha256 e019028e631725729376250e32b473012f7cb68e1f7275bfc1bbcdd0f8745f7e libaio_0.3.110.orig.tar.gz diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk index 53ad7eb223..9b28f0562a 100644 --- a/package/libaio/libaio.mk +++ b/package/libaio/libaio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAIO_VERSION = 0.3.109 +LIBAIO_VERSION = 0.3.110 LIBAIO_SOURCE = libaio_$(LIBAIO_VERSION).orig.tar.gz LIBAIO_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/liba/libaio LIBAIO_INSTALL_STAGING = YES From 4f6ba8cd458e3fa78789c8848493712b8574a294 Mon Sep 17 00:00:00 2001 From: Atul Singh Date: Wed, 17 Feb 2016 15:26:52 +0530 Subject: [PATCH 093/206] font-awesome:new package Font Awesome is a full suite of 605 pictographic icons for easy scalable vector graphics on websites. Signed-off-by: Atul Singh [Thomas: fix misc minor typos.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/font-awesome/Config.in | 7 +++++++ package/font-awesome/font-awesome.hash | 2 ++ package/font-awesome/font-awesome.mk | 18 ++++++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/font-awesome/Config.in create mode 100644 package/font-awesome/font-awesome.hash create mode 100644 package/font-awesome/font-awesome.mk diff --git a/package/Config.in b/package/Config.in index 422978f7ec..96b780c960 100644 --- a/package/Config.in +++ b/package/Config.in @@ -199,6 +199,7 @@ comment "Fonts" source "package/bitstream-vera/Config.in" source "package/cantarell/Config.in" source "package/dejavu/Config.in" + source "package/font-awesome/Config.in" source "package/ghostscript-fonts/Config.in" source "package/inconsolata/Config.in" source "package/liberation/Config.in" diff --git a/package/font-awesome/Config.in b/package/font-awesome/Config.in new file mode 100644 index 0000000000..694d74e5a8 --- /dev/null +++ b/package/font-awesome/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FONT_AWESOME + bool "font-awesome" + help + Font Awesome is a full suite of 605 pictographic icons for + easy scalable vector graphics on websites. + + https://github.com/FortAwesome/Font-Awesome diff --git a/package/font-awesome/font-awesome.hash b/package/font-awesome/font-awesome.hash new file mode 100644 index 0000000000..9f3715e5b6 --- /dev/null +++ b/package/font-awesome/font-awesome.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 7813f416057da622b16229b10fef550e1dc64c5bb59871cd38fa86e76dfdbae8 font-awesome-v4.5.0.tar.gz diff --git a/package/font-awesome/font-awesome.mk b/package/font-awesome/font-awesome.mk new file mode 100644 index 0000000000..6ebb92cc3a --- /dev/null +++ b/package/font-awesome/font-awesome.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# font-awesome +# +################################################################################ + +FONT_AWESOME_VERSION = v4.5.0 +FONT_AWESOME_SITE = $(call github,FortAwesome,Font-Awesome,$(FONT_AWESOME_VERSION)) +FONT_AWESOME_LICENSE = OFLv1.1 (font), MIT (CSS, LESS and Sass files) +FONT_AWESOME_DIRECTORIES_LIST = css fonts less scss + +define FONT_AWESOME_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/share/font-awesome/ + $(foreach d,$(FONT_AWESOME_DIRECTORIES_LIST),\ + cp -dpfr $(@D)/$(d) $(TARGET_DIR)/usr/share/font-awesome$(sep)) +endef + +$(eval $(generic-package)) From 5cc9bbaf99c9e5e35394f4400b071cf4ae8b1516 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Wed, 17 Feb 2016 13:27:50 +0100 Subject: [PATCH 094/206] libimxvpuapi: add new package This is a library for using the i.MX6 VPU. It is an alternative to libfslvpuwrap, hosted on Github, and has an API that features several improvements over libfslvpuwrap, which include: * User-defined context information associated with input frames, which is passed on to corresponding output frames (to be able to identify which input frame produced which output frame) * Groundwork for future DMA-BUF/BMM/ION/CMA allocator integration, using file descriptors instead of physical addresses * Indicators for when it is safe to try to decode frames, which is critical in multi-threaded playback cases * Simplified, higher-level JPEG en/decoding API, based on the VPU MJPEG codec; useful for picture viewing without the extra boilerplate for VPU-based en/decoding Changelog 0.10.0 -> 0.10.1: - add debian packaging files - update waf to version 1.8.16 - add workaround in wscript to prevent stale pkg-config .pc files - fix memory leak by adding missing IOFreeVirtMem() call in vpulib backend This patch is based on the Yocto equivalent: https://github.com/Freescale/meta-fsl-arm/commit/e519d6c https://github.com/Freescale/meta-fsl-arm/commit/1dd6a5b This package has been implicitely tested through gstreamer as the plugins rely on it for vpu decoding: # gst-launch-1.0 playbin uri=file:///root/tears_of_steel_1080p.webm Tested-by: Peter Seiderer Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/libimxvpuapi/Config.in | 12 +++++++++ package/libimxvpuapi/libimxvpuapi.hash | 2 ++ package/libimxvpuapi/libimxvpuapi.mk | 35 ++++++++++++++++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 package/libimxvpuapi/Config.in create mode 100644 package/libimxvpuapi/libimxvpuapi.hash create mode 100644 package/libimxvpuapi/libimxvpuapi.mk diff --git a/package/Config.in b/package/Config.in index 96b780c960..eba5c9a95c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1062,6 +1062,7 @@ menu "Multimedia" source "package/libfslparser/Config.in" source "package/libfslvpuwrap/Config.in" source "package/libhdhomerun/Config.in" + source "package/libimxvpuapi/Config.in" source "package/libmatroska/Config.in" source "package/libmms/Config.in" source "package/libmpeg2/Config.in" diff --git a/package/libimxvpuapi/Config.in b/package/libimxvpuapi/Config.in new file mode 100644 index 0000000000..85467f2015 --- /dev/null +++ b/package/libimxvpuapi/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_LIBIMXVPUAPI + bool "libimxvpuapi" + depends on BR2_arm # Only relevant for i.MX + select BR2_PACKAGE_FREESCALE_IMX + select BR2_PACKAGE_IMX_VPU + help + This library provides an API for using the iMX6 VPU video + engine. It is an alternative to Freescale's VPU + wrapper. Both the wrapper and this library are layered on + top of imx-vpu, the low-level iMX6 VPU interface. + + https://github.com/Freescale/libimxvpuapi diff --git a/package/libimxvpuapi/libimxvpuapi.hash b/package/libimxvpuapi/libimxvpuapi.hash new file mode 100644 index 0000000000..fd90a20564 --- /dev/null +++ b/package/libimxvpuapi/libimxvpuapi.hash @@ -0,0 +1,2 @@ +# locally computed hash +sha256 8d7aeed88c06fda44318cef9565ae47b86461bd309908b1103a7974ed0822a8d libimxvpuapi-0.10.1.tar.gz diff --git a/package/libimxvpuapi/libimxvpuapi.mk b/package/libimxvpuapi/libimxvpuapi.mk new file mode 100644 index 0000000000..e0d8cc981f --- /dev/null +++ b/package/libimxvpuapi/libimxvpuapi.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# libimxvpuapi +# +################################################################################ + +LIBIMXVPUAPI_VERSION = 0.10.1 +LIBIMXVPUAPI_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI_VERSION)) +LIBIMXVPUAPI_LICENSE = LGPLv2.1+ +LIBIMXVPUAPI_LICENSE_FILES = LICENSE +LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python imx-vpu +LIBIMXVPUAPI_INSTALL_STAGING = YES + +define LIBIMXVPUAPI_CONFIGURE_CMDS + cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/usr/bin/python2 ./waf configure \ + --prefix=/usr --libdir=/usr/lib +endef + +define LIBIMXVPUAPI_BUILD_CMDS + cd $(@D); \ + $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS) +endef + +define LIBIMXVPUAPI_INSTALL_STAGING_CMDS + cd $(@D); \ + $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(STAGING_DIR) install +endef + +define LIBIMXVPUAPI_INSTALL_TARGET_CMDS + cd $(@D); \ + $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) From f233f3c5ff533af7232fd046e7351abfe44cf84e Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Wed, 17 Feb 2016 13:27:51 +0100 Subject: [PATCH 095/206] gst1-imx: bump to version 0.12.0 Changelog: * vpu: - Completely rewritten plugin code; elements now based on libimxvpuapi instead of libfslvpuwrap - imxvpuenc_h264 inserts SPS/PPS data in front of I/IDR frames - imxvpuenc_mjpeg's quality factor actually has an effect, and is equivalent to the libjpeg's quality factor (it is used in exactly the same way to scale the quantization matrix' coefficients) - the encoder's output buffers no longer have to use DMA memory; they use regular system memory instead - new support in imxvpudec (referred to as "chroma interleaving") for NV12, NV16, NV24 as output formats as an alternative to the I420, Y42B, Y444 formats - removed all of the system frame number tracking code, since it is unnecessary; Instead, the libimxvpuapi's context fields are used to associate input/output frames with GstVideoCodecFrame system frame numbers - fix memory leaks related to missing buffer pool unref'ing * imxv4l2videosrc: - support for crop metadata - element uses the width, height, etc. of the format that the device actually uses during operation (instead of default values) - autofocus control support via GstPhotography - fix incorrect GLib warnings - fix segmentation fault when shutting down the element * eglvivsink: - remove extra g_free() calls, which lead to runtime errors - remove GLESv2 VIVANTE link dependencies - add Android platform - manually retrieve VIV direct texture functions with this and the link dependency elimination, this means that for platforms except the framebuffer one, no Vivante specific headers and libraries are needed anymore - fix blocking issue in the Wayland platform mainloop * improved and expanded documentation * pxp: NV16 *is* supported after all (it was actually a bug in GStreamer pre-1.5.91) NOTE: this does not break compatibility with GStreamer versions older than 1.5.91 * compositor: Update backported aggregator code to GStreamer 1.6 * blitter: - error handling improvements - add missing buffer pool unref'ing, which lead to memory leaks - add missing compositor dependency to blitter base * uniaudio: - only build the uniaudio plugin if at least one codec was found during configuration - disable plugin if the gstaudio library is not available - add AAC profile field to the sink caps with GStreamer >= 1.4.4 to ensure the uniaudio decoder is only used for AAC-LC data * ipu: increase fill frame width from 8 to 64 pixels to make IPU fill operations work with pre-3.14 Freescale kernels * g2d: use padding pixels when setting surface parameters, fixing G2D failures with frame sizes that aren't aligned * wscript: - improve Android support - fix installation paths for the common, blitter, compositor libraries This is based on the Yocto equivalent: https://github.com/Freescale/meta-fsl-arm/commit/cf7a088 However this package now offers a more flexible approach because it can be built without the GPU or VPU elements for devices based on SoCs that lack those features like the new i.MX7. Tested with the following commands on i.MX6Q (IPU): # gst-launch-1.0 playbin uri=file:///root/tears_of_steel_1080p.webm # gst-launch-1.0 filesrc location=/root/tears_of_steel_1080p.webm ! \ matroskademux ! imxvpudec ! imxipuvideosink # gst-launch-1.0 filesrc location=/root/tears_of_steel_1080p.webm ! \ matroskademux ! imxvpudec ! imxeglvivsink Tested with the following commands on i.MX6SX (PXP): # gst-launch-1.0 imxv4l2videosrc device=/dev/video1 ! imxpxpvideosink Signed-off-by: Gary Bisson Tested-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-imx/Config.in | 18 +++++++----------- package/gstreamer1/gst1-imx/gst1-imx.hash | 2 ++ package/gstreamer1/gst1-imx/gst1-imx.mk | 20 +++++++++++++++++--- 3 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 package/gstreamer1/gst1-imx/gst1-imx.hash diff --git a/package/gstreamer1/gst1-imx/Config.in b/package/gstreamer1/gst1-imx/Config.in index f7284f4bee..0084483d1e 100644 --- a/package/gstreamer1/gst1-imx/Config.in +++ b/package/gstreamer1/gst1-imx/Config.in @@ -1,27 +1,23 @@ comment "gst1-imx needs an imx-specific Linux kernel to be built" depends on BR2_arm && !BR2_LINUX_KERNEL -# Required by imx-gpu-viv -comment "gst1-imx needs an (e)glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC - config BR2_PACKAGE_GST1_IMX bool "gst1-imx" depends on BR2_LINUX_KERNEL depends on BR2_arm # Only relevant for i.MX - depends on BR2_TOOLCHAIN_USES_GLIBC # imx-gpu-viv - depends on BR2_PACKAGE_IMX_GPU_VIV - depends on BR2_PACKAGE_LIBFSLVPUWRAP select BR2_PACKAGE_GST1_PLUGINS_BASE help This is a set of GStreamer 1.0 plugins for plugins for Freescale's - i.MX6 platforms, with emphasis on video en/decoding using the VPU - engine. + i.MX platforms, which make use of the i.MX multimedia capabilities. This software supports only the i.MX6 SoC family and requires a kernel that includes the i.MX6 specific headers to be built. - The software as a whole is currently in beta stage. + The IPU and PXP plugins are always built. + The V4L2 plugin is built when BR2_PACKAGE_GST1_PLUGINS_BAD is enabled. + The VPU plugin is built when BR2_PACKAGE_LIBIMXVPUAPI is enabled. + The EGL plugin is built when BR2_PACKAGE_IMX_GPU_VIV is enabled. + The G2D plugin is built when BR2_PACKAGE_IMX_GPU_VIV_G2D is enabled. + The MP3 plugin is built when BR2_PACKAGE_LIBFSLCODEC is enabled. https://github.com/Freescale/gstreamer-imx diff --git a/package/gstreamer1/gst1-imx/gst1-imx.hash b/package/gstreamer1/gst1-imx/gst1-imx.hash new file mode 100644 index 0000000000..03e17299ba --- /dev/null +++ b/package/gstreamer1/gst1-imx/gst1-imx.hash @@ -0,0 +1,2 @@ +# locally computed hash +sha256 df34f080e24ac8f1619780aa5ad4e6ab1333f822cd2bf5fcb380b28c97248810 gst1-imx-0.12.0.tar.gz diff --git a/package/gstreamer1/gst1-imx/gst1-imx.mk b/package/gstreamer1/gst1-imx/gst1-imx.mk index 8ede8adf0d..ca6bc49eed 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.mk +++ b/package/gstreamer1/gst1-imx/gst1-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_IMX_VERSION = 0.11.1 +GST1_IMX_VERSION = 0.12.0 GST1_IMX_SITE = $(call github,Freescale,gstreamer-imx,$(GST1_IMX_VERSION)) GST1_IMX_LICENSE = LGPLv2+ @@ -12,14 +12,27 @@ GST1_IMX_LICENSE_FILES = LICENSE GST1_IMX_INSTALL_STAGING = YES -GST1_IMX_DEPENDENCIES += host-pkgconf host-python \ - imx-gpu-viv gstreamer1 gst1-plugins-base libfslvpuwrap +GST1_IMX_DEPENDENCIES += \ + host-pkgconf \ + host-python \ + gstreamer1 \ + gst1-plugins-base # needs access to imx-specific kernel headers GST1_IMX_DEPENDENCIES += linux GST1_IMX_CONF_OPTS += --prefix="/usr" \ --kernel-headers="$(LINUX_DIR)/include" +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD),y) +GST1_IMX_DEPENDENCIES += gst1-plugins-bad +endif + +ifeq ($(BR2_PACKAGE_LIBIMXVPUAPI),y) +GST1_IMX_DEPENDENCIES += libimxvpuapi +endif + +ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) +GST1_IMX_DEPENDENCIES += imx-gpu-viv ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) GST1_IMX_DEPENDENCIES += xlib_libX11 GST1_IMX_CONF_OPTS += --egl-platform=x11 @@ -31,6 +44,7 @@ else GST1_IMX_CONF_OPTS += --egl-platform=fb endif endif +endif define GST1_IMX_CONFIGURE_CMDS cd $(@D); \ From 2fb3f220807a5203c6854e30ab126e2f78b280cd Mon Sep 17 00:00:00 2001 From: Doug Kehn Date: Tue, 16 Feb 2016 20:45:24 -0600 Subject: [PATCH 096/206] package/dhcp: bump version to 4.3.3-P1 bind source tar-ball is now embedded into the dhcp source. The embedded bind tar-ball is extracted after the dhcp source so cross compiling patches can be applied to the dhcp and bind before the package is built. The embedded bind configure is called as part of dhcp make instead of dhcp configure; therefore, needed configure parameters are set in the make env. 0001-dhcp-cross-compile.patch and 0002-bind-cross-compile.patch have been submitted upstream as part of a cross compiling enhancement suggestion to dhcp-suggest@isc.org. Reference ISC-Bugs #41502. 0003-bind-hos-cc.patch is already scheduled for the next dhcp release. Buildroot thread http://lists.busybox.net/pipermail/buildroot/2016-January/149079.html has related information. Signed-off-by: Doug Kehn Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Ricardo Martincoski Reviewed-by: Ricardo Martincoski Tested-by: Ricardo Martincoski Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/dhcp/0001-dhcp-cross-compile.patch | 34 ++++++++++++++++++ package/dhcp/0002-bind-cross-compile.patch | 24 +++++++++++++ package/dhcp/0003-bind-host-cc.patch | 40 ++++++++++++++++++++++ package/dhcp/dhcp.hash | 4 +-- package/dhcp/dhcp.mk | 28 +++++++++++++-- 5 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 package/dhcp/0001-dhcp-cross-compile.patch create mode 100644 package/dhcp/0002-bind-cross-compile.patch create mode 100644 package/dhcp/0003-bind-host-cc.patch diff --git a/package/dhcp/0001-dhcp-cross-compile.patch b/package/dhcp/0001-dhcp-cross-compile.patch new file mode 100644 index 0000000000..95b468915f --- /dev/null +++ b/package/dhcp/0001-dhcp-cross-compile.patch @@ -0,0 +1,34 @@ +dhcp cross compile support integration + +Allow BINDCONFIG to be initialized in environment passed to configure. + +Allow archiver to be determined during configure. + +This patch is submitted upstream as part of a cross compiling enhancement +suggestion to dhcp-suggest@isc.org. Reference ISC-Bugs #41502. + +Signed-off-by: Doug Kehn + +Index: dhcp-4.3.3-P1/configure.ac +=================================================================== +--- dhcp-4.3.3-P1.orig/configure.ac ++++ dhcp-4.3.3-P1/configure.ac +@@ -33,7 +33,7 @@ if test "$GCC" = "yes"; then + fi + + # We can have some flags to pass to bind configure +-BINDCONFIG= ++BINDCONFIG="$BINDCONFIG" + AC_SUBST(BINDCONFIG) + + # POSIX doesn't include the IPv6 Advanced Socket API and glibc hides +@@ -43,6 +43,9 @@ AC_SUBST(BINDCONFIG) + # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. + AC_USE_SYSTEM_EXTENSIONS + ++AC_CHECK_TOOL(AR,ar) ++AC_SUBST(AR) ++ + AC_PROG_RANLIB + AC_CONFIG_HEADERS([includes/config.h]) + diff --git a/package/dhcp/0002-bind-cross-compile.patch b/package/dhcp/0002-bind-cross-compile.patch new file mode 100644 index 0000000000..f7c42c6ce2 --- /dev/null +++ b/package/dhcp/0002-bind-cross-compile.patch @@ -0,0 +1,24 @@ +bind cross compile support integration + +Pass system types from dhcp configure to bind configure. + +This patch is submitted upstream as part of a cross compiling enhancement +suggestion to dhcp-suggest@isc.org. Reference ISC-Bugs #41502. + +Signed-off-by: Doug Kehn + +Index: dhcp-4.3.3-P1/bind/Makefile.in +=================================================================== +--- dhcp-4.3.3-P1.orig/bind/Makefile.in ++++ dhcp-4.3.3-P1/bind/Makefile.in +@@ -30,7 +30,9 @@ bindconfig = --disable-kqueue --disable- + --without-openssl --without-libxml2 --enable-exportlib \ + --with-gssapi=no --enable-threads=no @BINDCONFIG@ \ + --with-export-includedir=${binddir}/include \ +- --with-export-libdir=${binddir}/lib ++ --with-export-libdir=${binddir}/lib \ ++ --target=@target_alias@ --host=@host_alias@ \ ++ --build=@build_alias@ + + @BIND_ATF_FALSE@cleandirs = ./lib ./include + @BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf diff --git a/package/dhcp/0003-bind-host-cc.patch b/package/dhcp/0003-bind-host-cc.patch new file mode 100644 index 0000000000..96c144fffb --- /dev/null +++ b/package/dhcp/0003-bind-host-cc.patch @@ -0,0 +1,40 @@ +ensure host compiler is used + +dns/Makefile.in patch is derived from: +http://wiki.beyondlogic.org/patches/dhcp-4.3.0b1.bind_arm-linux-gnueabi.patch + +This patch is already accepted upstream and will be included in the next +release: +--[snip]-- +From Francis Dupont via RT +To rdkehn@yahoo.com + +Message body +It was fixed on the master branch sometimes ago. +Quoting master RELNOTES: + +- Made the embedded bind libraries able to be cross compiled + (please refer to the bind9 documentation to learn how to cross + compile DHCP and its bind library dependency). + [ISC-Bugs #38836] + +This is in the Changes since 4.3.3 so for the next release. +--[snip]-- + +Signed-off-by: Doug Kehn + +Index: dhcp-4.3.3-P1/bind/bind-9.9.7-P3/lib/export/dns/Makefile.in +=================================================================== +--- dhcp-4.3.3-P1.orig/bind/bind-9.9.7-P3/lib/export/dns/Makefile.in ++++ dhcp-4.3.3-P1/bind/bind-9.9.7-P3/lib/export/dns/Makefile.in +@@ -168,7 +168,9 @@ code.h: gen + ./gen -s ${srcdir} > code.h + + gen: ${srcdir}/gen.c +- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS} ++ ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \ ++ ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c \ ++ ${BUILD_LIBS} + + #We don't need rbtdb64 for this library + #rbtdb64.@O@: rbtdb.c diff --git a/package/dhcp/dhcp.hash b/package/dhcp/dhcp.hash index 84e3c63816..fd9b24ad6d 100644 --- a/package/dhcp/dhcp.hash +++ b/package/dhcp/dhcp.hash @@ -1,2 +1,2 @@ -# Verified from ftp://ftp.isc.org/isc/dhcp/4.1-ESV-R12/dhcp-4.1-ESV-R12.tar.gz.sha256.asc -sha256 53265d1bf5e2073379df03c73a1a34d38a904307609c0f9cb77223912e753e5f dhcp-4.1-ESV-R12.tar.gz +# Verified from https://ftp.isc.org/isc/dhcp/4.3.3-P1/dhcp-4.3.3-P1.tar.gz.sha256.asc +sha256 c11e896dffa1bfbc49462965d3f6dec45534e34068603546d9a236f2aa669921 dhcp-4.3.3-P1.tar.gz diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index c05e69468b..5cb6043e7b 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCP_VERSION = 4.1-ESV-R12 +DHCP_VERSION = 4.3.3-P1 DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) DHCP_INSTALL_STAGING = YES DHCP_LICENSE = ISC @@ -12,7 +12,8 @@ DHCP_LICENSE_FILES = LICENSE DHCP_CONF_ENV = \ CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \ -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \ - ac_cv_file__dev_random=yes + ac_cv_file__dev_random=yes \ + BINDCONFIG='--with-randomdev=/dev/random' DHCP_CONF_OPTS = \ --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \ @@ -25,6 +26,29 @@ DHCP_CONF_OPTS = \ --with-relay-pid-file=/var/run/dhcrelay.pid \ --with-relay6-pid-file=/var/run/dhcrelay6.pid +# The source for the bind libraries used by dhcp are embedded in the dhcp source +# as a tar-ball. Extract the bind source to allow any patches to be applied +# during the patch phase. +define DHCP_EXTRACT_BIND + cd $(@D)/bind; tar -xvf bind.tar.gz +endef +DHCP_POST_EXTRACT_HOOKS += DHCP_EXTRACT_BIND + +# The patchset requires configure et.al. to be regenerated. +DHCP_AUTORECONF = YES + +# bind does not support parallel builds. +DHCP_MAKE = $(MAKE1) + +# bind configure is called via dhcp make instead of dhcp configure. The make env +# needs extra values for bind configure. +DHCP_MAKE_ENV = \ + $(TARGET_CONFIGURE_OPTS) \ + BUILD_CC="$(HOSTCC)" \ + BUILD_CFLAGS="$(HOST_CFLAGS)" \ + BUILD_CPPFLAGS="$(HOST_CPPFLAGS)" \ + BUILD_LDFLAGS="$(HOST_LDFLAGS)" + ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y) DHCP_CONF_OPTS += --enable-delayed-ack endif From 4558f82dea2db6f037d92940f95fd2fcaeb1ae4d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 21 Jan 2016 15:45:15 -0300 Subject: [PATCH 097/206] ifupdown: bump to version 0.8.8 Also add a kludge switching the explicit invocation of the ip binary from /bin to /sbin since that's where buildroot installs it. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/ifupdown/ifupdown.hash | 4 ++-- package/ifupdown/ifupdown.mk | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/package/ifupdown/ifupdown.hash b/package/ifupdown/ifupdown.hash index 02dfd2b6ac..c5a4189f62 100644 --- a/package/ifupdown/ifupdown.hash +++ b/package/ifupdown/ifupdown.hash @@ -1,2 +1,2 @@ -# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.8.2.dsc -sha256 edb08f935fea9bc376c3faa0140c04c7a4d4ef5f22fd280ec4060386a75df10b ifupdown_0.8.2.tar.xz +# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.8.8.dsc +sha256 180edaaa6de99e4e74de7229481edf74361b8e8468462842618a42a952a26c0e ifupdown_0.8.8.tar.xz diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk index 7fbd003650..37aaf5da09 100644 --- a/package/ifupdown/ifupdown.mk +++ b/package/ifupdown/ifupdown.mk @@ -4,9 +4,9 @@ # ################################################################################ -IFUPDOWN_VERSION = 0.8.2 +IFUPDOWN_VERSION = 0.8.8 IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz -IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20151205T042642Z/pool/main/i/ifupdown +IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160113T035819Z/pool/main/i/ifupdown IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) IFUPDOWN_LICENSE = GPLv2+ IFUPDOWN_LICENSE_FILES = COPYING @@ -23,4 +23,13 @@ define IFUPDOWN_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) BASEDIR=$(TARGET_DIR) -C $(@D) install endef +# We need to switch from /bin/ip to /sbin/ip +IFUPDOWN_DEFN_FILES = can inet inet6 ipx link meta +define IFUPDOWN_MAKE_IP_IN_SBIN + for f in $(IFUPDOWN_DEFN_FILES) ; do \ + $(SED) 's,/bin/ip,/sbin/ip,' $(@D)/$$f.defn ; \ + done +endef +IFUPDOWN_POST_PATCH_HOOKS += IFUPDOWN_MAKE_IP_IN_SBIN + $(eval $(generic-package)) From fb992c4fd286714e40f68c9be1bd09a0aa96652d Mon Sep 17 00:00:00 2001 From: Olivier Schonken Date: Thu, 21 Jan 2016 00:17:46 +0200 Subject: [PATCH 098/206] poppler: install xpdf-headers to enable building of cups-filters Add --enable-xpdf-headers to poppler.mk. Required for succesfull build of cups-filters. Signed-off-by: Olivier Schonken Reviewed-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/poppler/poppler.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 6142cbaf90..1113e4bd28 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -11,7 +11,8 @@ POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPLv2+ POPPLER_LICENSE_FILES = COPYING POPPLER_INSTALL_STAGING = YES -POPPLER_CONF_OPTS = --with-font-configuration=fontconfig +POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \ + --enable-xpdf-headers ifeq ($(BR2_PACKAGE_LCMS2),y) POPPLER_CONF_OPTS += --enable-cms=lcms2 From 89d210449c7c410ddc8524b595b070f425d515af Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Tue, 2 Feb 2016 18:37:42 +0100 Subject: [PATCH 099/206] gr-osmosdr: new package Add support for gr-osmosdr - a GNU Radio block for interfacing with various radio hardware. Signed-off-by: Gwenhael Goavec-Merou [Thomas: - instead of selecting BR2_PACKAGE_GNURADIO, use "depends on". Indeed, it is fairly obvious for a user that some GNURadio extensions require GNURadio to be built. And it avoids the need to replicate all the complex dependencies of GNURadio. - remove comment that the Python support needs Python. It's fairly obvious, no? - remove comment about the thread dependency of BR2_PACKAGE_GR_OSMOSDR_RTLSDR, since anyway GNURadio already need threads. Yes, we sometimes still add such dependencies, but in the case of GNURadio, it's highly unlikely that GNURadio will ever loose the thread dependency. - use "NO" instead of "no" as the value for GR_OSMOSDR_SUPPORTS_IN_SOURCE_BUILD since we always use upper-case letters for the value of such booleans.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/gr-osmosdr/Config.in | 37 ++++++++++++++++++++ package/gr-osmosdr/gr-osmosdr.hash | 2 ++ package/gr-osmosdr/gr-osmosdr.mk | 55 ++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+) create mode 100644 package/gr-osmosdr/Config.in create mode 100644 package/gr-osmosdr/gr-osmosdr.hash create mode 100644 package/gr-osmosdr/gr-osmosdr.mk diff --git a/package/Config.in b/package/Config.in index eba5c9a95c..c0b3b177e9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1299,6 +1299,7 @@ menu "Miscellaneous" source "package/empty/Config.in" source "package/gnuradio/Config.in" source "package/googlefontdirectory/Config.in" + source "package/gr-osmosdr/Config.in" source "package/haveged/Config.in" source "package/mcrypt/Config.in" source "package/mobile-broadband-provider-info/Config.in" diff --git a/package/gr-osmosdr/Config.in b/package/gr-osmosdr/Config.in new file mode 100644 index 0000000000..aa6ef0d4c2 --- /dev/null +++ b/package/gr-osmosdr/Config.in @@ -0,0 +1,37 @@ +config BR2_PACKAGE_GR_OSMOSDR + bool "gr-osmosdr" + depends on BR2_PACKAGE_GNURADIO + select BR2_PACKAGE_GNURADIO_BLOCKS + help + GNU Radio block for interfacing with various radio hardware + +if BR2_PACKAGE_GR_OSMOSDR + +config BR2_PACKAGE_GR_OSMOSDR_PYTHON + bool "python support" + depends on BR2_PACKAGE_GNURADIO_PYTHON + help + Enable Python support + +config BR2_PACKAGE_GR_OSMOSDR_IQFILE + bool "IQ File Source support" + help + Enable IQ File Source support + +config BR2_PACKAGE_GR_OSMOSDR_RTLSDR + bool "Osmocom RTLSDR support" + select BR2_PACKAGE_LIBRTLSDR + help + Enable Osmocom RTLSDR support + +config BR2_PACKAGE_GR_OSMOSDR_RTLSDR_TCP + bool "RTLSDR TCP Client support" + help + Enable RTLSDR TCP client support + +config BR2_PACKAGE_GR_OSMOSDR_RFSPACE + bool "RFSPACE Receivers support" + help + Enable RFSPACE Receivers support + +endif diff --git a/package/gr-osmosdr/gr-osmosdr.hash b/package/gr-osmosdr/gr-osmosdr.hash new file mode 100644 index 0000000000..ce6e84a279 --- /dev/null +++ b/package/gr-osmosdr/gr-osmosdr.hash @@ -0,0 +1,2 @@ +# Locally calculated: +sha256 d40462dddc0ebd769b2df3c6ad6fe82c9e9a4a73f7b3c5ce53efbce724906290 gr-osmosdr-a45968f3381f33b86ca344bb76bd62c131d98d93.tar.gz diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk new file mode 100644 index 0000000000..6a0cc267cf --- /dev/null +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -0,0 +1,55 @@ +################################################################################ +# +# gr-osmosdr +# +################################################################################ + +GR_OSMOSDR_VERSION = a45968f3381f33b86ca344bb76bd62c131d98d93 +GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,$(GR_OSMOSDR_VERSION)) +GR_OSMOSDR_LICENSE = GPLv3+ +GR_OSMOSDR_LICENSE_FILES = COPYING + +# gr-osmosdr prevents doing an in-source-tree build +GR_OSMOSDR_SUPPORTS_IN_SOURCE_BUILD = NO + +GR_OSMOSDR_DEPENDENCIES = gnuradio + +GR_OSMOSDR_CONF_OPTS = -DENABLE_DEFAULT=OFF + +# For third-party blocks, the gr-osmosdr libraries are mandatory at +# compile time. +GR_OSMOSDR_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_GR_OSMOSDR_PYTHON),y) +GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=ON +GR_OSMOSDR_DEPENDENCIES += python +else +GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=OFF +endif + +ifeq ($(BR2_PACKAGE_GR_OSMOSDR_IQFILE),y) +GR_OSMOSDR_CONF_OPTS += -DENABLE_FILE=ON +else +GR_OSMOSDR_CONF_OPTS += -DENABLE_FILE=OFF +endif + +ifeq ($(BR2_PACKAGE_GR_OSMOSDR_RTLSDR),y) +GR_OSMOSDR_CONF_OPTS += -DENABLE_RTL=ON +GR_OSMOSDR_DEPENDENCIES += librtlsdr +else +GR_OSMOSDR_CONF_OPTS += -DENABLE_RTL=OFF +endif + +ifeq ($(BR2_PACKAGE_GR_OSMOSDR_RTLSDR_TCP),y) +GR_OSMOSDR_CONF_OPTS += -DENABLE_RTL_TCP=ON +else +GR_OSMOSDR_CONF_OPTS += -DENABLE_RTL_TCP=OFF +endif + +ifeq ($(BR2_PACKAGE_GR_OSMOSDR_RFSPACE),y) +GR_OSMOSDR_CONF_OPTS += -DENABLE_RFSPACE=ON +else +GR_OSMOSDR_CONF_OPTS += -DENABLE_RFSPACE=OFF +endif + +$(eval $(cmake-package)) From 4a3b3a8ba5ef719d4aaee84b6d7ed9bb07663804 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 5 Feb 2016 23:43:12 +0100 Subject: [PATCH 100/206] package/pound: new package Signed-off-by: Bernd Kuhls [Thomas: pass --with-owner/--with-group instead of SEDing the Makefile.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/pound/Config.in | 18 ++++++++++++++++++ package/pound/pound.hash | 2 ++ package/pound/pound.mk | 24 ++++++++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 package/pound/Config.in create mode 100644 package/pound/pound.hash create mode 100644 package/pound/pound.mk diff --git a/package/Config.in b/package/Config.in index c0b3b177e9..23fd62c07a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1448,6 +1448,7 @@ endif source "package/p910nd/Config.in" source "package/phidgetwebservice/Config.in" source "package/portmap/Config.in" + source "package/pound/Config.in" source "package/pppd/Config.in" source "package/pptp-linux/Config.in" source "package/privoxy/Config.in" diff --git a/package/pound/Config.in b/package/pound/Config.in new file mode 100644 index 0000000000..91c29ea7a6 --- /dev/null +++ b/package/pound/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_POUND + bool "pound" + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_OPENSSL + help + The Pound program is a reverse proxy, load balancer and HTTPS + front-end for Web server(s). Pound was developed to enable + distributing the load among several Web-servers and to allow + for a convenient SSL wrapper for those Web servers that do not + offer it natively. + + http://www.apsis.ch/pound + +comment "pound needs a toolchain w/ dynamic library, threads" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU diff --git a/package/pound/pound.hash b/package/pound/pound.hash new file mode 100644 index 0000000000..6908b9060c --- /dev/null +++ b/package/pound/pound.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 cdfbf5a7e8dc8fbbe0d6c1e83cd3bd3f2472160aac65684bb01ef661c626a8e4 Pound-2.7.tgz diff --git a/package/pound/pound.mk b/package/pound/pound.mk new file mode 100644 index 0000000000..408664214b --- /dev/null +++ b/package/pound/pound.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# pound +# +################################################################################ + +POUND_VERSION = 2.7 +POUND_SITE = http://www.apsis.ch/pound +POUND_SOURCE = Pound-$(POUND_VERSION).tgz +POUND_LICENSE = GPLv3+ +POUND_LICENSE_FILES = GPL.txt +POUND_DEPENDENCIES = openssl + +# Force owner/group to us, otherwise it will try proxy:proxy by +# default. +POUND_CONF_OPTS = \ + --with-owner=$(shell id -un) \ + --with-group=$(shell id -gn) + +ifeq ($(BR2_PACKAGE_PCRE),y) +POUND_DEPENDENCIES += pcre +endif + +$(eval $(autotools-package)) From 699a992f9b0f1f98583e87b564145c2606f695f9 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Sat, 30 Jan 2016 23:46:09 +0100 Subject: [PATCH 101/206] python-iniparse: new package Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-iniparse/Config.in | 11 +++++++++++ package/python-iniparse/python-iniparse.hash | 4 ++++ package/python-iniparse/python-iniparse.mk | 14 ++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 package/python-iniparse/Config.in create mode 100644 package/python-iniparse/python-iniparse.hash create mode 100644 package/python-iniparse/python-iniparse.mk diff --git a/package/Config.in b/package/Config.in index 23fd62c07a..ba50199793 100644 --- a/package/Config.in +++ b/package/Config.in @@ -656,6 +656,7 @@ menu "External python modules" source "package/python-httplib2/Config.in" source "package/python-id3/Config.in" source "package/python-idna/Config.in" + source "package/python-iniparse/Config.in" source "package/python-ipaddr/Config.in" source "package/python-ipaddress/Config.in" source "package/python-ipy/Config.in" diff --git a/package/python-iniparse/Config.in b/package/python-iniparse/Config.in new file mode 100644 index 0000000000..65c1064927 --- /dev/null +++ b/package/python-iniparse/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_INIPARSE + bool "python-iniparse" + depends on BR2_PACKAGE_PYTHON + help + iniparse is an INI parser for Python which is API compatible + with the standard library's ConfigParser, preserves + structure of INI files (order of sections & options, + indentation, comments, and blank lines are preserved when + data is updated), and is more convenient to use. + + https://pypi.python.org/pypi/iniparse diff --git a/package/python-iniparse/python-iniparse.hash b/package/python-iniparse/python-iniparse.hash new file mode 100644 index 0000000000..d7d8e9336d --- /dev/null +++ b/package/python-iniparse/python-iniparse.hash @@ -0,0 +1,4 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=5e573e9e9733d97623881ce9bbe5eca6, sha256 locally computed +md5 5e573e9e9733d97623881ce9bbe5eca6 iniparse-0.4.tar.gz +sha256 abc1ee12d2cfb2506109072d6c21e40b6c75a3fe90a9c924327d80bc0d99c054 iniparse-0.4.tar.gz + diff --git a/package/python-iniparse/python-iniparse.mk b/package/python-iniparse/python-iniparse.mk new file mode 100644 index 0000000000..b00e0c4ae1 --- /dev/null +++ b/package/python-iniparse/python-iniparse.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-iniparse +# +################################################################################ + +PYTHON_INIPARSE_VERSION = 0.4 +PYTHON_INIPARSE_SOURCE = iniparse-$(PYTHON_INIPARSE_VERSION).tar.gz +PYTHON_INIPARSE_SITE = https://pypi.python.org/packages/source/i/iniparse +PYTHON_INIPARSE_LICENSE = Python software foundation license v2, MIT +PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE +PYTHON_INIPARSE_SETUP_TYPE = distutils + +$(eval $(python-package)) From 8b62b1b45a8364801b46569b5d3fd4ae489f76b7 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Sat, 30 Jan 2016 23:46:10 +0100 Subject: [PATCH 102/206] crudini: new package Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/crudini/Config.in | 9 +++++++++ package/crudini/crudini.hash | 3 +++ package/crudini/crudini.mk | 14 ++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/crudini/Config.in create mode 100644 package/crudini/crudini.hash create mode 100644 package/crudini/crudini.mk diff --git a/package/Config.in b/package/Config.in index ba50199793..c5442de3b9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1559,6 +1559,7 @@ endif comment "Utilities" source "package/at/Config.in" source "package/ccrypt/Config.in" + source "package/crudini/Config.in" source "package/dialog/Config.in" source "package/dtach/Config.in" source "package/file/Config.in" diff --git a/package/crudini/Config.in b/package/crudini/Config.in new file mode 100644 index 0000000000..e4e26e52da --- /dev/null +++ b/package/crudini/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_CRUDINI + bool "crudini" + depends on BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON_INIPARSE # runtime + help + A utility for handling ini files from the command line and + shell scripts + + https://pypi.python.org/pypi/crudini diff --git a/package/crudini/crudini.hash b/package/crudini/crudini.hash new file mode 100644 index 0000000000..b9aaecf7b8 --- /dev/null +++ b/package/crudini/crudini.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=7d1313f1bb9800db9cbceaa518bcf212, sha256 locally computed +md5 7d1313f1bb9800db9cbceaa518bcf212 crudini-0.7.tar.gz +sha256 5d493ae6600e54f9e0296b12d3adba99b88a439d8c4b2ebf9bc6f9c0613a03d7 crudini-0.7.tar.gz diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk new file mode 100644 index 0000000000..d797efcdc0 --- /dev/null +++ b/package/crudini/crudini.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# crudini +# +################################################################################ + +CRUDINI_VERSION = 0.7 +CRUDINI_SOURCE = crudini-$(CRUDINI_VERSION).tar.gz +CRUDINI_SITE = https://pypi.python.org/packages/source/c/crudini +CRUDINI_SETUP_TYPE = setuptools +CRUDINI_LICENSE = GPLv2 +CRUDINI_LICENSE_FILES = COPYING + +$(eval $(python-package)) From 4d14100fb4e6ddcf7eff01fe9c49676ccc3c7f1b Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Sun, 21 Feb 2016 17:16:27 -0500 Subject: [PATCH 103/206] erlang-fast_tls: remove unused package This package was added in error when updating ejabberd dependencies. It is not used. Signed-off-by: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 - package/erlang-fast_tls/Config.in | 8 -------- package/erlang-fast_tls/erlang-fast_tls.mk | 14 -------------- 3 files changed, 23 deletions(-) delete mode 100644 package/erlang-fast_tls/Config.in delete mode 100644 package/erlang-fast_tls/erlang-fast_tls.mk diff --git a/package/Config.in b/package/Config.in index c5442de3b9..c69d632e50 100644 --- a/package/Config.in +++ b/package/Config.in @@ -472,7 +472,6 @@ menu "Interpreter languages and scripting" source "package/erlang/Config.in" if BR2_PACKAGE_ERLANG menu "Erlang libraries/modules" - source "package/erlang-fast_tls/Config.in" source "package/erlang-goldrush/Config.in" source "package/erlang-lager/Config.in" source "package/erlang-p1-cache-tab/Config.in" diff --git a/package/erlang-fast_tls/Config.in b/package/erlang-fast_tls/Config.in deleted file mode 100644 index 3bf52a1e88..0000000000 --- a/package/erlang-fast_tls/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_ERLANG_FAST_TLS - bool "erlang-fast_tls" - select BR2_PACKAGE_ERLANG_P1_UTILS - select BR2_PACKAGE_OPENSSL - help - TLS / SSL OpenSSL-based native driver for Erlang / Elixir - - https://github.com/processone/fast_tls diff --git a/package/erlang-fast_tls/erlang-fast_tls.mk b/package/erlang-fast_tls/erlang-fast_tls.mk deleted file mode 100644 index 63c55c5daa..0000000000 --- a/package/erlang-fast_tls/erlang-fast_tls.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# erlang-fast_tls -# -################################################################################ - -ERLANG_FAST_TLS_VERSION = 1.0.0 -ERLANG_FAST_TLS_SITE = $(call github,processone,fast_tls,$(ERLANG_FAST_TLS_VERSION)) -ERLANG_FAST_TLS_LICENSE = Apache-2.0 -ERLANG_FAST_TLS_LICENSE_FILES = LICENSE.txt -ERLANG_FAST_TLS_INSTALL_STAGING = YES -ERLANG_FAST_TLS_DEPENDENCIES = openssl erlang-p1-utils - -$(eval $(rebar-package)) From 47da40e1d9f3bcad8635d563ae04e56597b8ca9e Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Sun, 21 Feb 2016 17:00:08 -0500 Subject: [PATCH 104/206] ejabberd: convert patches to git format Signed-off-by: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/ejabberd/0001-remove-deps.patch | 22 -------- .../0001-remove-make-targets-for-deps.patch | 29 ++++++++++ ...> 0002-remove-make-targets-for-deps.patch} | 19 +++++-- ...e-testing-with-MySQL-and-PostgreSQL.patch} | 25 ++++++--- .../ejabberd/0004-disable-version-check.patch | 20 ------- .../0004-remove-checking-erlang-version.patch | 30 ++++++++++ package/ejabberd/0005-correct-include.patch | 56 +++++++++++++++++++ package/ejabberd/0005-fix-includes.patch | 45 --------------- ...0006-disable-ERLANG_DEPRECATED_CHECK.patch | 27 +++++++++ ...isable-erlang-deprecated-types-check.patch | 20 ------- .../0007-fix-install-permissions.patch | 23 +++++--- package/ejabberd/0008-fix-ejabberdctl.patch | 21 +++++-- 12 files changed, 201 insertions(+), 136 deletions(-) delete mode 100644 package/ejabberd/0001-remove-deps.patch create mode 100644 package/ejabberd/0001-remove-make-targets-for-deps.patch rename package/ejabberd/{0002-disable-rebar-deps.patch => 0002-remove-make-targets-for-deps.patch} (79%) rename package/ejabberd/{0003-disable-test.patch => 0003-remove-testing-with-MySQL-and-PostgreSQL.patch} (53%) delete mode 100644 package/ejabberd/0004-disable-version-check.patch create mode 100644 package/ejabberd/0004-remove-checking-erlang-version.patch create mode 100644 package/ejabberd/0005-correct-include.patch delete mode 100644 package/ejabberd/0005-fix-includes.patch create mode 100644 package/ejabberd/0006-disable-ERLANG_DEPRECATED_CHECK.patch delete mode 100644 package/ejabberd/0006-disable-erlang-deprecated-types-check.patch diff --git a/package/ejabberd/0001-remove-deps.patch b/package/ejabberd/0001-remove-deps.patch deleted file mode 100644 index c5700dd7e3..0000000000 --- a/package/ejabberd/0001-remove-deps.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: remove make targets for deps - Without this patch, dependencies would be downloaded and compiled - using rebar at build time. -Author: Philipp Huebner - -Index: ejabberd/rebar.config.script -=================================================================== -diff --git a/rebar.config.script b/rebar.config.script -index 633433c..646a15a 100644 ---- a/rebar.config.script -+++ b/rebar.config.script -@@ -187,9 +187,7 @@ Config = [{erl_opts, Macros ++ HiPE ++ DebugInfo ++ - {xref_checks, []}, - {xref_queries, - [{"(XC - UC) || (XU - X - B - " -- ++ string:join(CfgXrefs, " - ") ++ ")", []}]}, -- {post_hooks, PostHooks ++ CfgPostHooks}, -- {deps, AllDeps}] ++ ElixirConfig, -+ ++ string:join(CfgXrefs, " - ") ++ ")", []}]}], - %%io:format("ejabberd configuration:~n ~p~n", [Config]), - Config. - diff --git a/package/ejabberd/0001-remove-make-targets-for-deps.patch b/package/ejabberd/0001-remove-make-targets-for-deps.patch new file mode 100644 index 0000000000..060c407398 --- /dev/null +++ b/package/ejabberd/0001-remove-make-targets-for-deps.patch @@ -0,0 +1,29 @@ +From a4910ec9257d0743e42c4b1650b6ef60196a013d Mon Sep 17 00:00:00 2001 +From: Philipp Huebner +Date: Sun, 21 Feb 2016 10:52:53 -0500 +Subject: [PATCH] remove make targets for deps + +Without this patch, dependencies would be downloaded and compiled +using rebar at build time. +--- + rebar.config.script | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/rebar.config.script b/rebar.config.script +index 833595d..1b6177d 100644 +--- a/rebar.config.script ++++ b/rebar.config.script +@@ -192,9 +192,7 @@ Config = [{erl_opts, Macros ++ HiPE ++ DebugInfo ++ + {xref_checks, []}, + {xref_queries, + [{"(XC - UC) || (XU - X - B - " +- ++ string:join(CfgXrefs, " - ") ++ ")", []}]}, +- {post_hooks, PostHooks ++ CfgPostHooks}, +- {deps, AllDeps}] ++ ElixirConfig, ++ ++ string:join(CfgXrefs, " - ") ++ ")", []}]}], + %%io:format("ejabberd configuration:~n ~p~n", [Config]), + Config. + +-- +2.5.0 + diff --git a/package/ejabberd/0002-disable-rebar-deps.patch b/package/ejabberd/0002-remove-make-targets-for-deps.patch similarity index 79% rename from package/ejabberd/0002-disable-rebar-deps.patch rename to package/ejabberd/0002-remove-make-targets-for-deps.patch index e76b8a2321..757ae38fe7 100644 --- a/package/ejabberd/0002-disable-rebar-deps.patch +++ b/package/ejabberd/0002-remove-make-targets-for-deps.patch @@ -1,10 +1,14 @@ -Description: remove make targets for deps - Without this patch, dependencies would be downloaded and compiled - using rebar at build time. -Author: Philipp Huebner +From 9ab065047fab913b7250525a51b9c9ad6f3a3478 Mon Sep 17 00:00:00 2001 +From: Philipp Huebner +Date: Sun, 21 Feb 2016 10:55:14 -0500 +Subject: [PATCH] remove make targets for deps + +Without this patch, dependencies would be downloaded and compiled +using rebar at build time. +--- + Makefile.in | 32 ++++---------------------------- + 1 file changed, 4 insertions(+), 28 deletions(-) -Index: ejabberd/Makefile.in -=================================================================== diff --git a/Makefile.in b/Makefile.in index 8dd6bf5..b9d783a 100644 --- a/Makefile.in @@ -74,3 +78,6 @@ index 8dd6bf5..b9d783a 100644 dialyzer/erlang.plt: @mkdir -p dialyzer @dialyzer --build_plt --output_plt dialyzer/erlang.plt \ +-- +2.5.0 + diff --git a/package/ejabberd/0003-disable-test.patch b/package/ejabberd/0003-remove-testing-with-MySQL-and-PostgreSQL.patch similarity index 53% rename from package/ejabberd/0003-disable-test.patch rename to package/ejabberd/0003-remove-testing-with-MySQL-and-PostgreSQL.patch index 1b28957257..316406ad89 100644 --- a/package/ejabberd/0003-disable-test.patch +++ b/package/ejabberd/0003-remove-testing-with-MySQL-and-PostgreSQL.patch @@ -1,16 +1,20 @@ -Description: remove testing with MySQL and PostgreSQL - Without this patch a test would be initiated after building ejabberd that - requires specially configured instances of MySQL and PostgreSQL to be up - and running. -Author: Philipp Huebner +From a4192bbd52250bd52d80b05f81cd5645abc650dc Mon Sep 17 00:00:00 2001 +From: Philipp Huebner +Date: Sun, 21 Feb 2016 10:59:14 -0500 +Subject: [PATCH] remove testing with MySQL and PostgreSQL + +Without this patch a test would be initiated after building ejabberd +that requires specially configured instances of MySQL and PostgreSQL +to be up and running. +--- + Makefile.in | 6 ------ + 1 file changed, 6 deletions(-) -Index: ejabberd/Makefile.in -=================================================================== diff --git a/Makefile.in b/Makefile.in -index ffd1d30..835d611 100644 +index b9d783a..9cd905f 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -306,14 +306,8 @@ dialyzer: erlang_plt deps_plt ejabberd_plt +@@ -282,14 +282,8 @@ dialyzer: erlang_plt deps_plt ejabberd_plt status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi test: @@ -25,3 +29,6 @@ index ffd1d30..835d611 100644 .PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean rel \ install uninstall uninstall-binary uninstall-all translations deps test spec \ +-- +2.5.0 + diff --git a/package/ejabberd/0004-disable-version-check.patch b/package/ejabberd/0004-disable-version-check.patch deleted file mode 100644 index f2f1e81e56..0000000000 --- a/package/ejabberd/0004-disable-version-check.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: remove checking erlang version - Without this patch, the configure will try to run erlang to simply check if - the version is supported by ejabberd. Instead, we do this test statically. -Author: Johan Oudinet - -Index: ejabberd/configure.ac -=================================================================== ---- ejabberd.orig/configure.ac 2014-10-20 11:04:14.751256865 +0200 -+++ ejabberd/configure.ac 2014-10-20 11:03:47.983578623 +0200 -@@ -37,10 +37,8 @@ AC_ARG_ENABLE(erlang-version-check, - [Check Erlang/OTP version @<:@default=yes@:>@])]) - case "$enable_erlang_version_check" in - yes|'') -- ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX]) - ;; - no) -- ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX],[warn]) - ;; - esac - diff --git a/package/ejabberd/0004-remove-checking-erlang-version.patch b/package/ejabberd/0004-remove-checking-erlang-version.patch new file mode 100644 index 0000000000..8997cca079 --- /dev/null +++ b/package/ejabberd/0004-remove-checking-erlang-version.patch @@ -0,0 +1,30 @@ +From bec405139144c8901b7d3771f5f658a3fed64b8a Mon Sep 17 00:00:00 2001 +From: Johan Oudinet +Date: Sun, 21 Feb 2016 11:00:24 -0500 +Subject: [PATCH] remove checking erlang version + +Without this patch, the configure will try to run erlang to simply +check if the version is supported by ejabberd. Instead, we do this test +statically. +--- + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d5f313e..4b35d57 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -39,10 +39,8 @@ AC_ARG_ENABLE(erlang-version-check, + [Check Erlang/OTP version @<:@default=yes@:>@])]) + case "$enable_erlang_version_check" in + yes|'') +- ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX]) + ;; + no) +- ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX],[warn]) + ;; + esac + +-- +2.5.0 + diff --git a/package/ejabberd/0005-correct-include.patch b/package/ejabberd/0005-correct-include.patch new file mode 100644 index 0000000000..dc2d1c3066 --- /dev/null +++ b/package/ejabberd/0005-correct-include.patch @@ -0,0 +1,56 @@ +From 9878a2cfb1a927f4b42f1c4d08df434084739626 Mon Sep 17 00:00:00 2001 +From: Philipp Huebner +Date: Sun, 21 Feb 2016 11:01:42 -0500 +Subject: [PATCH] correct include + +This part of the code was moved into it's own project and was packaged +separately by me. To make the build process work, this small fix is +necessary. +--- + src/mod_sip.erl | 2 +- + src/mod_sip_proxy.erl | 2 +- + src/mod_sip_registrar.erl | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/mod_sip.erl b/src/mod_sip.erl +index 1e4044b..4279b64 100644 +--- a/src/mod_sip.erl ++++ b/src/mod_sip.erl +@@ -38,7 +38,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include_lib("esip/include/esip.hrl"). ++-include_lib("p1_sip/include/esip.hrl"). + + %%%=================================================================== + %%% API +diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl +index a0dff12..b5794fa 100644 +--- a/src/mod_sip_proxy.erl ++++ b/src/mod_sip_proxy.erl +@@ -40,7 +40,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include_lib("esip/include/esip.hrl"). ++-include_lib("p1_sip/include/esip.hrl"). + + -define(SIGN_LIFETIME, 300). %% in seconds. + +diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl +index f6b3103..1061c88 100644 +--- a/src/mod_sip_registrar.erl ++++ b/src/mod_sip_registrar.erl +@@ -37,7 +37,7 @@ + + -include("ejabberd.hrl"). + -include("logger.hrl"). +--include_lib("esip/include/esip.hrl"). ++-include_lib("p1_sip/include/esip.hrl"). + + -define(CALL_TIMEOUT, timer:seconds(30)). + -define(DEFAULT_EXPIRES, 3600). +-- +2.5.0 + diff --git a/package/ejabberd/0005-fix-includes.patch b/package/ejabberd/0005-fix-includes.patch deleted file mode 100644 index 27ad761541..0000000000 --- a/package/ejabberd/0005-fix-includes.patch +++ /dev/null @@ -1,45 +0,0 @@ -Description: correct include - This part of the code was moved into it's own project and was packaged - separately by me. To make the build process work, this small fix is - necessary. -Author: Philipp Huebner - -Index: ejabberd/src/mod_sip_proxy.erl -=================================================================== ---- ejabberd.orig/src/mod_sip_proxy.erl -+++ ejabberd/src/mod_sip_proxy.erl -@@ -21,7 +21,7 @@ - - -include("ejabberd.hrl"). - -include("logger.hrl"). ---include_lib("esip/include/esip.hrl"). -+-include_lib("p1_sip/include/esip.hrl"). - - -define(SIGN_LIFETIME, 300). %% in seconds. - -Index: ejabberd/src/mod_sip.erl -=================================================================== ---- ejabberd.orig/src/mod_sip.erl -+++ ejabberd/src/mod_sip.erl -@@ -20,7 +20,7 @@ - - -include("ejabberd.hrl"). - -include("logger.hrl"). ---include_lib("esip/include/esip.hrl"). -+-include_lib("p1_sip/include/esip.hrl"). - - %%%=================================================================== - %%% API -Index: ejabberd/src/mod_sip_registrar.erl -=================================================================== ---- ejabberd.orig/src/mod_sip_registrar.erl -+++ ejabberd/src/mod_sip_registrar.erl -@@ -20,7 +20,7 @@ - - -include("ejabberd.hrl"). - -include("logger.hrl"). ---include_lib("esip/include/esip.hrl"). -+-include_lib("p1_sip/include/esip.hrl"). - - -define(CALL_TIMEOUT, timer:seconds(30)). - -define(DEFAULT_EXPIRES, 3600). diff --git a/package/ejabberd/0006-disable-ERLANG_DEPRECATED_CHECK.patch b/package/ejabberd/0006-disable-ERLANG_DEPRECATED_CHECK.patch new file mode 100644 index 0000000000..ea52b3eb1e --- /dev/null +++ b/package/ejabberd/0006-disable-ERLANG_DEPRECATED_CHECK.patch @@ -0,0 +1,27 @@ +From 615eae56cabd7d15a8f62b6f50e598818932c9ca Mon Sep 17 00:00:00 2001 +From: Johan Oudinet +Date: Sun, 21 Feb 2016 11:02:33 -0500 +Subject: [PATCH] disable ERLANG_DEPRECATED_CHECK + +Without this patch, the configure will try to execute erlang to check +if it uses deprecated types. Assume the answer is false. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4b35d57..da87585 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -243,7 +243,7 @@ if test "$ENABLEUSER" != ""; then + AC_SUBST([INSTALLUSER], [$ENABLEUSER]) + fi + +-ERLANG_DEPRECATED_TYPES_CHECK ++AC_SUBST(erlang_deprecated_types, false) + + if test "$sqlite" = "true"; then + AX_LIB_SQLITE3([3.6.19]) +-- +2.5.0 + diff --git a/package/ejabberd/0006-disable-erlang-deprecated-types-check.patch b/package/ejabberd/0006-disable-erlang-deprecated-types-check.patch deleted file mode 100644 index 1b709531cd..0000000000 --- a/package/ejabberd/0006-disable-erlang-deprecated-types-check.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: disable ERLANG_DEPRECATED_CHECK - Without this patch, the configure will try to execute erlang to check - if it uses deprecated types. Assume the answer is false. -Author: Johan Oudinet - -Index: ejabberd/configure.ac -==================================================================== -diff --git a/configure.ac b/configure.ac -index 6ae0a24..e5498df 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -252,7 +252,7 @@ if test "$ENABLEUSER" != ""; then - AC_SUBST([INSTALLUSER], [$ENABLEUSER]) - fi - --ERLANG_DEPRECATED_TYPES_CHECK -+AC_SUBST(erlang_deprecated_types, false) - - if test "$sqlite" = "true"; then - AX_LIB_SQLITE3([3.6.19]) diff --git a/package/ejabberd/0007-fix-install-permissions.patch b/package/ejabberd/0007-fix-install-permissions.patch index 2ad8453238..e30b49e2fa 100644 --- a/package/ejabberd/0007-fix-install-permissions.patch +++ b/package/ejabberd/0007-fix-install-permissions.patch @@ -1,13 +1,17 @@ -Description: fix install permissions - Without this patch, the makefile will try to install directories and - files with incompatible permissions for ejabberd, which run as an - ejabberd user. -Author: Johan Oudinet +From 0f4db8755263c0825b02b4197cdb64b11fb8c638 Mon Sep 17 00:00:00 2001 +From: Johan Oudinet +Date: Sun, 21 Feb 2016 11:03:16 -0500 +Subject: [PATCH] fix install permissions + +Without this patch, the makefile will try to install directories and +files with incompatible permissions for ejabberd, which run as an +ejabberd user. +--- + Makefile.in | 40 ++++++---------------------------------- + 1 file changed, 6 insertions(+), 34 deletions(-) -Index: ejabberd/Makefile.in -=================================================================== diff --git a/Makefile.in b/Makefile.in -index b9d783a..6ec805a 100644 +index 9cd905f..442b851 100644 --- a/Makefile.in +++ b/Makefile.in @@ -122,10 +122,8 @@ copy-files: $(call TO_DEST,$(MAIN_FILES)) @@ -77,3 +81,6 @@ index b9d783a..6ec805a 100644 uninstall: uninstall-binary +-- +2.5.0 + diff --git a/package/ejabberd/0008-fix-ejabberdctl.patch b/package/ejabberd/0008-fix-ejabberdctl.patch index af0b6eea6c..fc23fff719 100644 --- a/package/ejabberd/0008-fix-ejabberdctl.patch +++ b/package/ejabberd/0008-fix-ejabberdctl.patch @@ -1,10 +1,16 @@ -Description: fix ejabberdctl - Change default values so ejabberdctl run commands as ejabberd user - Also add a way for the user to change default values. -Signed-off-by: Johan Oudinet +From dc6046d9eaef16dc4e9fcda2021219910bfea0de Mon Sep 17 00:00:00 2001 +From: Johan Oudinet +Date: Sun, 21 Feb 2016 11:03:58 -0500 +Subject: [PATCH] fix ejabberdctl + +Change default values so ejabberdctl run commands as ejabberd user +Also add a way for the user to change default values. + +Signed-off-by: Johan Oudinet +--- + ejabberdctl.template | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) -Index: ejabberd/ejabberdctl.template -=================================================================== diff --git a/ejabberdctl.template b/ejabberdctl.template index c7d76ef..a7afce1 100755 --- a/ejabberdctl.template @@ -23,3 +29,6 @@ index c7d76ef..a7afce1 100755 # check the proper system user is used if defined if [ "$INSTALLUSER" != "" ] ; then EXEC_CMD="false" +-- +2.5.0 + From c3deb953391f2ff67247fedbe0b5b6627fcd8f51 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Sun, 21 Feb 2016 17:00:09 -0500 Subject: [PATCH 105/206] ejabberd: bump to version 16.01 Signed-off-by: Frank Hunleth Signed-off-by: Thomas Petazzoni --- .../0001-remove-make-targets-for-deps.patch | 85 ++++++++++++++----- ...emove-dependencies-from-rebar-config.patch | 85 +++++++++++++++++++ .../0002-remove-make-targets-for-deps.patch | 83 ------------------ ...0003-remove-checking-erlang-version.patch} | 10 +-- ...ve-testing-with-MySQL-and-PostgreSQL.patch | 34 -------- ...clude.patch => 0004-correct-include.patch} | 10 +-- ...005-disable-ERLANG_DEPRECATED_CHECK.patch} | 8 +- ...tch => 0006-fix-install-permissions.patch} | 30 +++---- ...rdctl.patch => 0007-fix-ejabberdctl.patch} | 6 +- package/ejabberd/ejabberd.hash | 6 +- package/ejabberd/ejabberd.mk | 2 +- 11 files changed, 185 insertions(+), 174 deletions(-) create mode 100644 package/ejabberd/0002-remove-dependencies-from-rebar-config.patch delete mode 100644 package/ejabberd/0002-remove-make-targets-for-deps.patch rename package/ejabberd/{0004-remove-checking-erlang-version.patch => 0003-remove-checking-erlang-version.patch} (75%) delete mode 100644 package/ejabberd/0003-remove-testing-with-MySQL-and-PostgreSQL.patch rename package/ejabberd/{0005-correct-include.patch => 0004-correct-include.patch} (88%) rename package/ejabberd/{0006-disable-ERLANG_DEPRECATED_CHECK.patch => 0005-disable-ERLANG_DEPRECATED_CHECK.patch} (75%) rename package/ejabberd/{0007-fix-install-permissions.patch => 0006-fix-install-permissions.patch} (78%) rename package/ejabberd/{0008-fix-ejabberdctl.patch => 0007-fix-ejabberdctl.patch} (86%) diff --git a/package/ejabberd/0001-remove-make-targets-for-deps.patch b/package/ejabberd/0001-remove-make-targets-for-deps.patch index 060c407398..6917f71f31 100644 --- a/package/ejabberd/0001-remove-make-targets-for-deps.patch +++ b/package/ejabberd/0001-remove-make-targets-for-deps.patch @@ -1,29 +1,76 @@ -From a4910ec9257d0743e42c4b1650b6ef60196a013d Mon Sep 17 00:00:00 2001 +From 21d1f05a8882657c151397d0e4723535402f1757 Mon Sep 17 00:00:00 2001 From: Philipp Huebner -Date: Sun, 21 Feb 2016 10:52:53 -0500 +Date: Wed, 20 Jan 2016 10:22:57 -0500 Subject: [PATCH] remove make targets for deps Without this patch, dependencies would be downloaded and compiled using rebar at build time. ---- - rebar.config.script | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) -diff --git a/rebar.config.script b/rebar.config.script -index 833595d..1b6177d 100644 ---- a/rebar.config.script -+++ b/rebar.config.script -@@ -192,9 +192,7 @@ Config = [{erl_opts, Macros ++ HiPE ++ DebugInfo ++ - {xref_checks, []}, - {xref_queries, - [{"(XC - UC) || (XU - X - B - " -- ++ string:join(CfgXrefs, " - ") ++ ")", []}]}, -- {post_hooks, PostHooks ++ CfgPostHooks}, -- {deps, AllDeps}] ++ ElixirConfig, -+ ++ string:join(CfgXrefs, " - ") ++ ")", []}]}], - %%io:format("ejabberd configuration:~n ~p~n", [Config]), - Config. +Signed-off-by: Frank Hunleth +--- + Makefile.in | 26 +++----------------------- + 1 file changed, 3 insertions(+), 23 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 08cd837..2a6457c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -77,26 +77,11 @@ else + INIT_USER=$(INSTALLUSER) + endif +-all: deps src ++all: src + +-deps: deps/.got +- +-deps/.got: +- rm -rf deps/.got +- rm -rf deps/.built +- $(REBAR) get-deps && :> deps/.got +- +-deps/.built: deps/.got +- $(REBAR) compile && :> deps/.built +- +-src: deps/.built ++src: + $(REBAR) skip_deps=true compile + +-update: +- rm -rf deps/.got +- rm -rf deps/.built +- $(REBAR) update-deps && :> deps/.got +- + xref: all + $(REBAR) skip_deps=true xref + +@@ -152,16 +137,13 @@ $(foreach file,$(DEPS_FILES_FILTERED) $(MAIN_FILES),$(eval $(call COPY_template, + $(sort $(call TO_DEST,$(MAIN_DIRS) $(DEPS_DIRS))): + $(INSTALL) -d $@ + +-$(call TO_DEST,deps/p1_pam/priv/bin/epam): $(LIBDIR)/%: deps/p1_pam/priv/bin/epam $(call TO_DEST,deps/p1_pam/priv/bin/) +- $(INSTALL) -m 750 $(O_USER) $< $@ +- + $(call TO_DEST,priv/sql/lite.sql): sql/lite.sql $(call TO_DEST,priv/sql) + $(INSTALL) -m 644 $< $@ + + $(call TO_DEST,priv/bin/captcha.sh): tools/captcha.sh $(call TO_DEST,priv/bin) + $(INSTALL) -m 750 $(O_USER) $< $@ + +-copy-files-sub2: $(call TO_DEST,$(DEPS_FILES) $(MAIN_FILES) priv/bin/captcha.sh priv/sql/lite.sql) ++copy-files-sub2: $(call TO_DEST,$(MAIN_FILES) priv/bin/captcha.sh priv/sql/lite.sql) + + endif + +@@ -287,8 +269,6 @@ TAGS: + + Makefile: Makefile.in + +-deps := $(wildcard deps/*/ebin) +- + dialyzer/erlang.plt: + @mkdir -p dialyzer + @dialyzer --build_plt --output_plt dialyzer/erlang.plt \ -- 2.5.0 diff --git a/package/ejabberd/0002-remove-dependencies-from-rebar-config.patch b/package/ejabberd/0002-remove-dependencies-from-rebar-config.patch new file mode 100644 index 0000000000..9dcea1c320 --- /dev/null +++ b/package/ejabberd/0002-remove-dependencies-from-rebar-config.patch @@ -0,0 +1,85 @@ +From d399ecdd99e62b5554210a3b5c733e738e4d54be Mon Sep 17 00:00:00 2001 +From: Philipp Huebner +Date: Wed, 20 Jan 2016 08:08:42 -0500 +Subject: [PATCH] remove dependencies from rebar config + +Without this patch, dependencies would be downloaded and compiled +by rebar at build time. + +Signed-off-by: Frank Hunleth +--- + rebar.config | 51 --------------------------------------------------- + 1 file changed, 51 deletions(-) + +diff --git a/rebar.config b/rebar.config +index 30c0360..d6a5b4d 100644 +--- a/rebar.config ++++ b/rebar.config +@@ -7,48 +7,6 @@ + %%% Created : 1 May 2013 by Evgeniy Khramtsov + %%%------------------------------------------------------------------- + +-{deps, [{if_var_true, lager, {lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.0.2"}}}}, +- {if_var_false, lager, {p1_logger, ".*", {git, "https://github.com/processone/p1_logger", {tag, "1.0.0"}}}}, +- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.2"}}}, +- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.1"}}}, +- {p1_tls, ".*", {git, "https://github.com/processone/tls", {tag, "1.0.0"}}}, +- {p1_stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.0"}}}, +- {p1_xml, ".*", {git, "https://github.com/processone/xml", {tag, "1.1.1"}}}, +- {p1_stun, ".*", {git, "https://github.com/processone/stun", "0.9.0"}}, +- {esip, ".*", {git, "https://github.com/processone/p1_sip", "1.0.0"}}, +- {p1_yaml, ".*", {git, "https://github.com/processone/p1_yaml", {tag, "1.0.0"}}}, +- {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.5"}}}, +- {oauth2, ".*", {git, "https://github.com/kivra/oauth2", "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8"}}, +- {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc", {tag, "1.15"}}}, +- {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/mysql", {tag, "1.0.0"}}}}, +- {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/pgsql", {tag, "1.0.0"}}}}, +- {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/alexeyr/erlang-sqlite3", "cbc3505f7a131254265d3ef56191b2581b8cc172"}}}, +- {if_var_true, pam, {p1_pam, ".*", {git, "https://github.com/processone/epam", {tag, "1.0.0"}}}}, +- {if_var_true, zlib, {p1_zlib, ".*", {git, "https://github.com/processone/zlib", {tag, "1.0.0"}}}}, +- {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang", "908a24fda4a46776a5135db60ca071e3d783f9f6"}}}, % for riak_pb-2.1.0.7 +- {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", "527722d12d0433b837cdb92a60900c2cb5df8942"}}}, +- {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", {tag, "v1.1.0"}}}}, +- {if_var_true, elixir, {rebar_elixir_plugin, ".*", {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}, +- {if_var_true, iconv, {p1_iconv, ".*", {git, "https://github.com/processone/eiconv", {tag, "0.9.0"}}}}, +- {if_var_true, tools, {meck, "0.8.2", {git, "https://github.com/eproxus/meck", {tag, "0.8.2"}}}}, +- {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis", {tag, "v1.0.8"}}}}]}. +- +-{if_var_true, latest_deps, +- {floating_deps, [p1_logger, +- cache_tab, +- p1_tls, +- p1_stringprep, +- p1_xml, +- esip, +- p1_stun, +- p1_yaml, +- p1_utils, +- p1_mysql, +- p1_pgsql, +- p1_pam, +- p1_zlib, +- p1_iconv]}}. +- + {erl_opts, [nowarn_deprecated_function, + {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}}, + {if_var_match, db_type, mssql, {d, 'mssql'}}, +@@ -92,15 +50,6 @@ + + {eunit_compile_opts, [{i, "tools"}]}. + +-{post_hook_configure, [{"p1_tls", []}, +- {"p1_stringprep", []}, +- {"p1_yaml", []}, +- {"esip", []}, +- {"p1_xml", [{if_var_true, full_xml, "--enable-full-xml"}]}, +- {if_var_true, pam, {"p1_pam", []}}, +- {if_var_true, zlib, {"p1_zlib", []}}, +- {if_var_true, iconv, {"p1_iconv", []}}]}. +- + {port_env, [{"CFLAGS", "-g -O2 -Wall"}]}. + + {port_specs, [{"priv/lib/jid.so", ["c_src/jid.c"]}]}. +-- +2.5.0 + diff --git a/package/ejabberd/0002-remove-make-targets-for-deps.patch b/package/ejabberd/0002-remove-make-targets-for-deps.patch deleted file mode 100644 index 757ae38fe7..0000000000 --- a/package/ejabberd/0002-remove-make-targets-for-deps.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 9ab065047fab913b7250525a51b9c9ad6f3a3478 Mon Sep 17 00:00:00 2001 -From: Philipp Huebner -Date: Sun, 21 Feb 2016 10:55:14 -0500 -Subject: [PATCH] remove make targets for deps - -Without this patch, dependencies would be downloaded and compiled -using rebar at build time. ---- - Makefile.in | 32 ++++---------------------------- - 1 file changed, 4 insertions(+), 28 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 8dd6bf5..b9d783a 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -77,26 +77,11 @@ else - INIT_USER=$(INSTALLUSER) - endif - --all: deps src -+all: src - --deps: deps/.got -- --deps/.got: -- rm -rf deps/.got -- rm -rf deps/.built -- $(REBAR) get-deps && :> deps/.got -- --deps/.built: deps/.got -- $(REBAR) compile && :> deps/.built -- --src: deps/.built -+src: - $(REBAR) skip_deps=true compile - --update: -- rm -rf deps/.got -- rm -rf deps/.built -- $(REBAR) update-deps && :> deps/.got -- - xref: all - $(REBAR) skip_deps=true xref - -@@ -129,13 +114,10 @@ endef - - $(foreach file,$(DEPS_FILES_FILTERED) $(MAIN_FILES),$(eval $(call COPY_template,$(file)))) - --$(call TO_DEST,$(MAIN_DIRS) $(DEPS_DIRS)): -+$(call TO_DEST,$(MAIN_DIRS)): - $(INSTALL) -d $@ - --$(call TO_DEST,deps/p1_pam/priv/bin/epam): $(LIBDIR)/%: deps/% $(call TO_DEST,deps/p1_pam/priv/bin/) -- $(INSTALL) -m 750 $(O_USER) $< $@ -- --copy-files: $(call TO_DEST,$(DEPS_FILES) $(MAIN_FILES)) -+copy-files: $(call TO_DEST,$(MAIN_FILES)) - - install: all copy-files - # -@@ -172,10 +154,6 @@ install: all copy-files - -e "s*@installuser@*$(INIT_USER)*" ejabberd.init.template \ - > ejabberd.init - chmod 755 ejabberd.init -- # Install Elixir and Elixir dependancies -- -$(INSTALL) -m 644 deps/*/lib/*/ebin/*.app $(BEAMDIR) -- -$(INSTALL) -m 644 deps/*/lib/*/ebin/*.beam $(BEAMDIR) -- rm -f $(BEAMDIR)/configure.beam - # - # Binary C programs - $(INSTALL) -d $(PBINDIR) -@@ -266,8 +244,6 @@ TAGS: - - Makefile: Makefile.in - --deps := $(wildcard deps/*/ebin) -- - dialyzer/erlang.plt: - @mkdir -p dialyzer - @dialyzer --build_plt --output_plt dialyzer/erlang.plt \ --- -2.5.0 - diff --git a/package/ejabberd/0004-remove-checking-erlang-version.patch b/package/ejabberd/0003-remove-checking-erlang-version.patch similarity index 75% rename from package/ejabberd/0004-remove-checking-erlang-version.patch rename to package/ejabberd/0003-remove-checking-erlang-version.patch index 8997cca079..ebcdd54645 100644 --- a/package/ejabberd/0004-remove-checking-erlang-version.patch +++ b/package/ejabberd/0003-remove-checking-erlang-version.patch @@ -1,17 +1,17 @@ -From bec405139144c8901b7d3771f5f658a3fed64b8a Mon Sep 17 00:00:00 2001 +From f384518dedec4ad657ad69d55754076c13c22d96 Mon Sep 17 00:00:00 2001 From: Johan Oudinet -Date: Sun, 21 Feb 2016 11:00:24 -0500 +Date: Wed, 20 Jan 2016 08:11:32 -0500 Subject: [PATCH] remove checking erlang version -Without this patch, the configure will try to run erlang to simply -check if the version is supported by ejabberd. Instead, we do this test +Without this patch, the configure will try to run erlang to simply check +if the version is supported by ejabberd. Instead, we do this test statically. --- configure.ac | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac -index d5f313e..4b35d57 100644 +index 97e89a2..cd1ab08 100644 --- a/configure.ac +++ b/configure.ac @@ -39,10 +39,8 @@ AC_ARG_ENABLE(erlang-version-check, diff --git a/package/ejabberd/0003-remove-testing-with-MySQL-and-PostgreSQL.patch b/package/ejabberd/0003-remove-testing-with-MySQL-and-PostgreSQL.patch deleted file mode 100644 index 316406ad89..0000000000 --- a/package/ejabberd/0003-remove-testing-with-MySQL-and-PostgreSQL.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a4192bbd52250bd52d80b05f81cd5645abc650dc Mon Sep 17 00:00:00 2001 -From: Philipp Huebner -Date: Sun, 21 Feb 2016 10:59:14 -0500 -Subject: [PATCH] remove testing with MySQL and PostgreSQL - -Without this patch a test would be initiated after building ejabberd -that requires specially configured instances of MySQL and PostgreSQL -to be up and running. ---- - Makefile.in | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index b9d783a..9cd905f 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -282,14 +282,8 @@ dialyzer: erlang_plt deps_plt ejabberd_plt - status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi - - test: -- @echo "************************** NOTICE ***************************************" -- @cat test/README -- @echo "*************************************************************************" -- @cd priv && ln -sf ../sql -- $(REBAR) skip_deps=true ct - - quicktest: -- $(REBAR) skip_deps=true ct suites=elixir - - .PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean rel \ - install uninstall uninstall-binary uninstall-all translations deps test spec \ --- -2.5.0 - diff --git a/package/ejabberd/0005-correct-include.patch b/package/ejabberd/0004-correct-include.patch similarity index 88% rename from package/ejabberd/0005-correct-include.patch rename to package/ejabberd/0004-correct-include.patch index dc2d1c3066..fd1dee2850 100644 --- a/package/ejabberd/0005-correct-include.patch +++ b/package/ejabberd/0004-correct-include.patch @@ -1,6 +1,6 @@ -From 9878a2cfb1a927f4b42f1c4d08df434084739626 Mon Sep 17 00:00:00 2001 +From 705a9ad229de49cd9cce226a2025716902455663 Mon Sep 17 00:00:00 2001 From: Philipp Huebner -Date: Sun, 21 Feb 2016 11:01:42 -0500 +Date: Wed, 20 Jan 2016 08:13:21 -0500 Subject: [PATCH] correct include This part of the code was moved into it's own project and was packaged @@ -13,7 +13,7 @@ necessary. 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mod_sip.erl b/src/mod_sip.erl -index 1e4044b..4279b64 100644 +index c8c9533..7f188a0 100644 --- a/src/mod_sip.erl +++ b/src/mod_sip.erl @@ -38,7 +38,7 @@ @@ -26,7 +26,7 @@ index 1e4044b..4279b64 100644 %%%=================================================================== %%% API diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl -index a0dff12..b5794fa 100644 +index bf297bc..d8b65cd 100644 --- a/src/mod_sip_proxy.erl +++ b/src/mod_sip_proxy.erl @@ -40,7 +40,7 @@ @@ -39,7 +39,7 @@ index a0dff12..b5794fa 100644 -define(SIGN_LIFETIME, 300). %% in seconds. diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl -index f6b3103..1061c88 100644 +index 44091ed..4d2ec82 100644 --- a/src/mod_sip_registrar.erl +++ b/src/mod_sip_registrar.erl @@ -37,7 +37,7 @@ diff --git a/package/ejabberd/0006-disable-ERLANG_DEPRECATED_CHECK.patch b/package/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch similarity index 75% rename from package/ejabberd/0006-disable-ERLANG_DEPRECATED_CHECK.patch rename to package/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch index ea52b3eb1e..4b68f5ff85 100644 --- a/package/ejabberd/0006-disable-ERLANG_DEPRECATED_CHECK.patch +++ b/package/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch @@ -1,6 +1,6 @@ -From 615eae56cabd7d15a8f62b6f50e598818932c9ca Mon Sep 17 00:00:00 2001 +From d43a65b112ec995a5ee52aca2a16e5cf9699d7c1 Mon Sep 17 00:00:00 2001 From: Johan Oudinet -Date: Sun, 21 Feb 2016 11:02:33 -0500 +Date: Wed, 20 Jan 2016 08:16:26 -0500 Subject: [PATCH] disable ERLANG_DEPRECATED_CHECK Without this patch, the configure will try to execute erlang to check @@ -10,10 +10,10 @@ if it uses deprecated types. Assume the answer is false. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 4b35d57..da87585 100644 +index cd1ab08..a4f1533 100644 --- a/configure.ac +++ b/configure.ac -@@ -243,7 +243,7 @@ if test "$ENABLEUSER" != ""; then +@@ -235,7 +235,7 @@ if test "$ENABLEUSER" != ""; then AC_SUBST([INSTALLUSER], [$ENABLEUSER]) fi diff --git a/package/ejabberd/0007-fix-install-permissions.patch b/package/ejabberd/0006-fix-install-permissions.patch similarity index 78% rename from package/ejabberd/0007-fix-install-permissions.patch rename to package/ejabberd/0006-fix-install-permissions.patch index e30b49e2fa..4d77044902 100644 --- a/package/ejabberd/0007-fix-install-permissions.patch +++ b/package/ejabberd/0006-fix-install-permissions.patch @@ -1,20 +1,22 @@ -From 0f4db8755263c0825b02b4197cdb64b11fb8c638 Mon Sep 17 00:00:00 2001 +From ef847479778cc58818e066b87aa1789ba1c4148b Mon Sep 17 00:00:00 2001 From: Johan Oudinet -Date: Sun, 21 Feb 2016 11:03:16 -0500 +Date: Wed, 20 Jan 2016 09:34:07 -0500 Subject: [PATCH] fix install permissions Without this patch, the makefile will try to install directories and files with incompatible permissions for ejabberd, which run as an ejabberd user. + +Signed-off-by: Frank Hunleth --- - Makefile.in | 40 ++++++---------------------------------- - 1 file changed, 6 insertions(+), 34 deletions(-) + Makefile.in | 38 +++++--------------------------------- + 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 9cd905f..442b851 100644 +index 2a6457c..0be4c50 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -122,10 +122,8 @@ copy-files: $(call TO_DEST,$(MAIN_FILES)) +@@ -155,10 +155,8 @@ copy-files-sub: copy-files-sub2 install: all copy-files # # Configuration files @@ -27,7 +29,7 @@ index 9cd905f..442b851 100644 $(SED) -e "s*{{rootdir}}*@prefix@*" \ -e "s*{{installuser}}*@INSTALLUSER@*" \ -e "s*{{bindir}}*@bindir@*" \ -@@ -135,14 +133,11 @@ install: all copy-files +@@ -168,14 +166,11 @@ install: all copy-files -e "s*{{docdir}}*@docdir@*" \ -e "s*{{erl}}*@ERL@*" ejabberdctl.template \ > ejabberdctl.example @@ -45,16 +47,10 @@ index 9cd905f..442b851 100644 # Elixir binaries [ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR) [ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true -@@ -157,34 +152,11 @@ install: all copy-files - # - # Binary C programs - $(INSTALL) -d $(PBINDIR) -- $(INSTALL) -m 750 $(O_USER) tools/captcha.sh $(PBINDIR) -+ $(INSTALL) tools/captcha.sh $(PBINDIR) - # - # Copy lite.sql - [ -d deps/sqlite3 ] && $(INSTALL) -d $(SQLDIR) || true - [ -d deps/sqlite3 ] && $(INSTALL) -m 644 sql/lite.sql $(SQLDIR) || true +@@ -187,29 +182,6 @@ install: all copy-files + -e "s*@installuser@*$(INIT_USER)*" ejabberd.init.template \ + > ejabberd.init + chmod 755 ejabberd.init - # - # Spool directory - $(INSTALL) -d -m 750 $(O_USER) $(SPOOLDIR) diff --git a/package/ejabberd/0008-fix-ejabberdctl.patch b/package/ejabberd/0007-fix-ejabberdctl.patch similarity index 86% rename from package/ejabberd/0008-fix-ejabberdctl.patch rename to package/ejabberd/0007-fix-ejabberdctl.patch index fc23fff719..36aa3a707f 100644 --- a/package/ejabberd/0008-fix-ejabberdctl.patch +++ b/package/ejabberd/0007-fix-ejabberdctl.patch @@ -1,6 +1,6 @@ -From dc6046d9eaef16dc4e9fcda2021219910bfea0de Mon Sep 17 00:00:00 2001 +From 53d7d654026afa163a55b860e33c6901129e8dc1 Mon Sep 17 00:00:00 2001 From: Johan Oudinet -Date: Sun, 21 Feb 2016 11:03:58 -0500 +Date: Wed, 20 Jan 2016 09:35:07 -0500 Subject: [PATCH] fix ejabberdctl Change default values so ejabberdctl run commands as ejabberd user @@ -12,7 +12,7 @@ Signed-off-by: Johan Oudinet 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ejabberdctl.template b/ejabberdctl.template -index c7d76ef..a7afce1 100755 +index f65c21f..ff9225f 100755 --- a/ejabberdctl.template +++ b/ejabberdctl.template @@ -14,9 +14,12 @@ SCRIPT_DIR=`cd ${0%/*} && pwd` diff --git a/package/ejabberd/ejabberd.hash b/package/ejabberd/ejabberd.hash index b027183ff1..ea85d1cf4a 100644 --- a/package/ejabberd/ejabberd.hash +++ b/package/ejabberd/ejabberd.hash @@ -1,4 +1,4 @@ -# From https://www.process-one.net/downloads/ejabberd/15.11/ejabberd-15.11.tgz.md5 -md5 a6997b88d44c5a5acff45bb1d938d0f3 ejabberd-15.11.tgz +# From https://www.process-one.net/downloads/ejabberd/15.11/ejabberd-16.01.tgz.md5 +md5 5e525c25c8f04287217b8a9522d7c942 ejabberd-16.01.tgz # Locally computed -sha256 01044b5a25f9f8dda8c60726698bd27d650751b810e5bfa23f9bb49ba20e946a ejabberd-15.11.tgz +sha256 e2cc479d5870539b2e6756690b227969c88a541d464d1fc6e1cbf7270ad7d681 ejabberd-16.01.tgz diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk index 841c9119d2..a3aad358ea 100644 --- a/package/ejabberd/ejabberd.mk +++ b/package/ejabberd/ejabberd.mk @@ -4,7 +4,7 @@ # ################################################################################ -EJABBERD_VERSION = 15.11 +EJABBERD_VERSION = 16.01 EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz EJABBERD_SITE = https://www.process-one.net/downloads/ejabberd/$(EJABBERD_VERSION) EJABBERD_LICENSE = GPLv2+ with OpenSSL exception From f0b6540c07c712309aed6e87e06eb37a29acd6df Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Sun, 21 Feb 2016 17:00:10 -0500 Subject: [PATCH 106/206] ejabberd: add reason for autoreconf Signed-off-by: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/ejabberd/ejabberd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk index a3aad358ea..1140eb1741 100644 --- a/package/ejabberd/ejabberd.mk +++ b/package/ejabberd/ejabberd.mk @@ -13,6 +13,7 @@ EJABBERD_DEPENDENCIES = getent openssl host-erlang-lager erlang-lager \ erlang-p1-cache-tab erlang-p1-iconv erlang-p1-sip \ erlang-p1-stringprep erlang-p1-xml erlang-p1-yaml erlang-p1-zlib +# 0001-remove-make-targets-for-deps.patch updates Makefile.in EJABBERD_USE_AUTOCONF = YES EJABBERD_AUTORECONF = YES From ddc2285ff2be6841e5144d3a5749d14fa21ea425 Mon Sep 17 00:00:00 2001 From: Julian Scheel Date: Wed, 27 Jan 2016 09:40:11 +0100 Subject: [PATCH 107/206] package/multicat: Add package multicat is a simple and efficient multicast and transport stream manipulation tool. Signed-off-by: Julian Scheel Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/multicat/Config.in | 11 +++++++++++ package/multicat/multicat.hash | 4 ++++ package/multicat/multicat.mk | 23 +++++++++++++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 package/multicat/Config.in create mode 100644 package/multicat/multicat.hash create mode 100644 package/multicat/multicat.mk diff --git a/package/Config.in b/package/Config.in index c69d632e50..dc6818436c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -28,6 +28,7 @@ menu "Audio and video applications" source "package/mpd-mpc/Config.in" source "package/mpg123/Config.in" source "package/mplayer/Config.in" + source "package/multicat/Config.in" source "package/musepack/Config.in" source "package/ncmpc/Config.in" source "package/on2-8170-libs/Config.in" diff --git a/package/multicat/Config.in b/package/multicat/Config.in new file mode 100644 index 0000000000..8dfb6c134a --- /dev/null +++ b/package/multicat/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_MULTICAT + bool "multicat" + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_BITSTREAM + help + Simple and efficient multicast and transport stream manipulation. + + http://www.videolan.org/projects/multicat.html + +comment 'multicat needs a toolchain w/ threads' + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/multicat/multicat.hash b/package/multicat/multicat.hash new file mode 100644 index 0000000000..38cf9d7dc4 --- /dev/null +++ b/package/multicat/multicat.hash @@ -0,0 +1,4 @@ +# from https://get.videolan.org/multicat/2.1/multicat-2.1.tar.bz2.md5 +md5 2e3ecd8dee64f5bd32a61733d4cc2226 multicat-2.1.tar.bz2 +# locally calculated +sha256 5eabe8d9a3dde452b2d348683cc7da213680551a9d4059c356f7319c6aa9b3d1 multicat-2.1.tar.bz2 diff --git a/package/multicat/multicat.mk b/package/multicat/multicat.mk new file mode 100644 index 0000000000..5909bc51ee --- /dev/null +++ b/package/multicat/multicat.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# multicat +# +################################################################################ + +MULTICAT_VERSION = 2.1 +MULTICAT_SOURCE = multicat-$(MULTICAT_VERSION).tar.bz2 +MULTICAT_SITE = https://get.videolan.org/multicat/$(MULTICAT_VERSION) +MULTICAT_LICENSE = GPLv2+ +MULTICAT_LICENSE_FILES = COPYING + +MULTICAT_MAKE_ENV = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) + +define MULTICAT_BUILD_CMDS + $(MULTICAT_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define MULTICAT_INSTALL_TARGET_CMDS + $(MULTICAT_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr install +endef + +$(eval $(generic-package)) From 027b7ca0f240d3c7a51f3b2ea151c04329c4b569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20Garc=C3=ADa?= Date: Sun, 21 Feb 2016 10:12:10 -0300 Subject: [PATCH 108/206] arch/arm: add the cortex A17 variant supported by gcc 5.x Add the Cortex A17 variant. This core is considered a replacement of the Cortex A12 and is supported by gcc 5 / binutils 2.25+ Suggested-by: Ross Green Signed-off-by: Ezequiel Garcia Signed-off-by: Peter Korsgaard --- arch/Config.in.arm | 9 +++++++++ package/binutils/Config.in.host | 4 ++++ package/gcc/Config.in.host | 9 ++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 2b34f42850..04f0369c0b 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -159,6 +159,14 @@ config BR2_cortex_a15 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL +config BR2_cortex_a17 + bool "cortex-A17" + select BR2_ARM_CPU_HAS_ARM + select BR2_ARM_CPU_HAS_NEON + select BR2_ARM_CPU_HAS_VFPV4 + select BR2_ARM_CPU_HAS_THUMB2 + select BR2_ARM_CPU_ARMV7A + select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_m3 bool "cortex-M3" select BR2_ARM_CPU_HAS_THUMB @@ -442,6 +450,7 @@ config BR2_GCC_TARGET_CPU default "cortex-a9" if BR2_cortex_a9 default "cortex-a12" if BR2_cortex_a12 default "cortex-a15" if BR2_cortex_a15 + default "cortex-a17" if BR2_cortex_a17 default "cortex-m3" if BR2_cortex_m3 default "fa526" if BR2_fa526 default "marvell-pj4" if BR2_pj4 diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index df3c385de5..07574e42ca 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -12,6 +12,8 @@ choice !BR2_powerpc64le && !BR2_nios2 # Unsupported for MIPS R6 depends on !BR2_mips_32r6 && !BR2_mips_64r6 + # Unsupported ARM cores + depends on !BR2_cortex_a17 bool "binutils 2.23.2" config BR2_BINUTILS_VERSION_2_24_X @@ -19,6 +21,8 @@ choice depends on !BR2_nios2 && !BR2_powerpc64le # Unsupported for MIPS R6 depends on !BR2_mips_32r6 && !BR2_mips_64r6 + # Unsupported ARM cores + depends on !BR2_cortex_a17 bool "binutils 2.24" config BR2_BINUTILS_VERSION_2_25_X diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index cad6896b44..560ea52104 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -21,7 +21,8 @@ choice && !BR2_powerpc64le && !BR2_nios2 # Broken or unsupported ARM cores depends on !BR2_cortex_a7 && !BR2_cortex_a12 && \ - !BR2_cortex_a15 && !BR2_fa526 && !BR2_pj4 + !BR2_cortex_a15 && !BR2_cortex_a17 && \ + !BR2_fa526 && !BR2_pj4 # Broken or unsupported PPC cores depends on !BR2_powerpc_e5500 && !BR2_powerpc_e6500 && \ !BR2_powerpc_power8 @@ -44,7 +45,7 @@ choice depends on !BR2_microblaze && !BR2_aarch64 && !BR2_arc \ && !BR2_powerpc64le && !BR2_nios2 # Broken or unsupported ARM cores - depends on !BR2_cortex_a12 && !BR2_pj4 + depends on !BR2_cortex_a12 && !BR2_pj4 && !BR2_cortex_a17 # Broken or unsupported PPC cores depends on !BR2_powerpc_e5500 && !BR2_powerpc_e6500 && \ !BR2_powerpc_power8 @@ -63,7 +64,7 @@ choice depends on !BR2_microblaze && !BR2_arc \ && !BR2_powerpc64le && !BR2_nios2 # Broken or unsupported ARM cores - depends on !BR2_cortex_a12 + depends on !BR2_cortex_a12 && !BR2_cortex_a17 # Broken or unsupported PPC cores depends on !BR2_powerpc_power8 # gcc-4.8.x + binutils-2.25 is broken for MIPS @@ -86,6 +87,8 @@ choice bool "gcc 4.9.x" # Broken or unsupported architectures depends on !BR2_arc + # Broken or unsupported ARM cores + depends on !BR2_cortex_a17 # Unsupported for MIPS R6 depends on !BR2_mips_32r6 && !BR2_mips_64r6 # PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102 From a1e14c85378957b4a82958879169b82226065c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20Garc=C3=ADa?= Date: Sun, 21 Feb 2016 10:12:11 -0300 Subject: [PATCH 109/206] board/firefly_rk3288: Update ARM variant and fix kernel repo This commit updates the two firefly_rk3288 defconfigs recently added. First we switch to the ARM cortex-A17 core. Second, we switch the kernel github access from SSH to HTTPS, which is suitable for anonymous access. Signed-off-by: Ezequiel Garcia Signed-off-by: Peter Korsgaard --- configs/firefly_rk3288_defconfig | 4 ++-- configs/firefly_rk3288_demo_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/firefly_rk3288_defconfig b/configs/firefly_rk3288_defconfig index bd3faa62ba..0affd677e1 100644 --- a/configs/firefly_rk3288_defconfig +++ b/configs/firefly_rk3288_defconfig @@ -1,5 +1,5 @@ BR2_arm=y -BR2_cortex_a12=y +BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_TARGET_GENERIC_HOSTNAME="firefly-rk3288" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/firefly-rk3288/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/firefly/firefly-rk3288/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git@github.com:mmind/linux-rockchip.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/mmind/linux-rockchip.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ccb89e9b5657b4911c16d08e1581121222ee12c4" BR2_LINUX_KERNEL_DEFCONFIG="rk3288_veyron" BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" diff --git a/configs/firefly_rk3288_demo_defconfig b/configs/firefly_rk3288_demo_defconfig index 4a0aca12d0..59bbe77247 100644 --- a/configs/firefly_rk3288_demo_defconfig +++ b/configs/firefly_rk3288_demo_defconfig @@ -1,5 +1,5 @@ BR2_arm=y -BR2_cortex_a12=y +BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y @@ -10,7 +10,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/firefly-rk3288/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/firefly/firefly-rk3288/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git@github.com:mmind/linux-rockchip.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/mmind/linux-rockchip.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ccb89e9b5657b4911c16d08e1581121222ee12c4" BR2_LINUX_KERNEL_DEFCONFIG="rk3288_veyron" BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" From d86a987a8f6aa445ec11eaa00d14d5177ae45166 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 21 Feb 2016 23:19:41 -0300 Subject: [PATCH 110/206] harfbuzz: bump to version 1.2.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/harfbuzz/harfbuzz.hash | 4 ++-- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 67050a78b7..b7330fcba6 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,2 +1,2 @@ -# From http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.1.3.tar.bz2.sha256 -sha256 d93d7cb7979c32672e902fdfa884599e63f07f2fa5b06c66147d20c516d4b8f7 harfbuzz-1.1.3.tar.bz2 +# From http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.2.0.tar.bz2.sha256 +sha256 79ff5305153d15931fbdda80c9612783b0283dee44f4c2af71aa37353daaa685 harfbuzz-1.2.0.tar.bz2 diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index c704f3262a..7cdc35699d 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 1.1.3 +HARFBUZZ_VERSION = 1.2.0 HARFBUZZ_SITE = http://www.freedesktop.org/software/harfbuzz/release HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 70c26b8c53c395ef4194cbed5b121a2b9243e4e8 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 22 Feb 2016 18:59:15 +0000 Subject: [PATCH 111/206] afboot-stm32: new package This is a _very_ small bootloader for STM32 platforms. At submission afboot-stm32 supports the following boards: stm32429i-eval stm32746g-eval stm32f429i-disco stm32f469i-disco Signed-off-by: Lee Jones Reviewed-by: Thomas Petazzoni [Thomas: fix commit title, add dependency on BR2_arm.] Signed-off-by: Thomas Petazzoni --- boot/Config.in | 1 + boot/afboot-stm32/Config.in | 7 +++++++ boot/afboot-stm32/afboot-stm32.hash | 2 ++ boot/afboot-stm32/afboot-stm32.mk | 18 ++++++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 boot/afboot-stm32/Config.in create mode 100644 boot/afboot-stm32/afboot-stm32.hash create mode 100644 boot/afboot-stm32/afboot-stm32.mk diff --git a/boot/Config.in b/boot/Config.in index 54760b9dac..4daf07952c 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -1,5 +1,6 @@ menu "Bootloaders" +source "boot/afboot-stm32/Config.in" source "boot/at91bootstrap/Config.in" source "boot/at91bootstrap3/Config.in" source "boot/at91dataflashboot/Config.in" diff --git a/boot/afboot-stm32/Config.in b/boot/afboot-stm32/Config.in new file mode 100644 index 0000000000..309b9e0491 --- /dev/null +++ b/boot/afboot-stm32/Config.in @@ -0,0 +1,7 @@ +config BR2_TARGET_AFBOOT_STM32 + bool "afboot-stm32" + depends on BR2_arm + help + afboot-stm32 is a very small bootloader for STM32 platforms + + https://github.com/mcoquelin-stm32/afboot-stm32 diff --git a/boot/afboot-stm32/afboot-stm32.hash b/boot/afboot-stm32/afboot-stm32.hash new file mode 100644 index 0000000000..d23b74ad21 --- /dev/null +++ b/boot/afboot-stm32/afboot-stm32.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 dbd715c8b99f7d266f74a04707a4dac76b75b31321f24dee5256a6348260530c afboot-stm32-v0.1.tar.gz diff --git a/boot/afboot-stm32/afboot-stm32.mk b/boot/afboot-stm32/afboot-stm32.mk new file mode 100644 index 0000000000..ac85d58b90 --- /dev/null +++ b/boot/afboot-stm32/afboot-stm32.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# afboot-stm32 +# +################################################################################ + +AFBOOT_STM32_VERSION = v0.1 +AFBOOT_STM32_SITE = $(call github,mcoquelin-stm32,afboot-stm32,$(AFBOOT_STM32_VERSION)) + +define AFBOOT_STM32_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all +endef + +define AFBOOT_STM32_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 $(@D)/stm32*.bin $(BINARIES_DIR) +endef + +$(eval $(generic-package)) From 330b112f7474f40c4bb5b6b3aa9b652ca7010c77 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 22 Feb 2016 08:40:21 -0300 Subject: [PATCH 112/206] musl: bump to version 1.1.14 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- ...fputs-that-fwrite-returning-0-implie.patch | 38 ------------------- package/musl/musl.hash | 2 +- package/musl/musl.mk | 2 +- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 package/musl/1.1.13/0001-fix-assumption-in-fputs-that-fwrite-returning-0-implie.patch diff --git a/package/musl/1.1.13/0001-fix-assumption-in-fputs-that-fwrite-returning-0-implie.patch b/package/musl/1.1.13/0001-fix-assumption-in-fputs-that-fwrite-returning-0-implie.patch deleted file mode 100644 index b32b7524ee..0000000000 --- a/package/musl/1.1.13/0001-fix-assumption-in-fputs-that-fwrite-returning-0-implie.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 10a17dfbad2c267d885817abc9c7589fc7ff630b Mon Sep 17 00:00:00 2001 -From: Rich Felker -Date: Tue, 16 Feb 2016 13:26:16 -0500 -Subject: [PATCH] fix assumption in fputs that fwrite returning 0 implies an - error - -internally, the idiom of passing nmemb=1 to fwrite and interpreting -the return value of fwrite (which is necessarily 0 or 1) as -failure/success is fairly widely used. this is not correct, however, -when the size argument is unknown and may be zero, since C requires -fwrite to return 0 in that special case. previously fwrite always -returned nmemb on success, but this was changed for conformance with -ISO C by commit 500c6886c654fd45e4926990fee2c61d816be197. - -Signed-off-by: Gustavo Zacarias ---- -Status: upstream. - - src/stdio/fputs.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/stdio/fputs.c b/src/stdio/fputs.c -index 4737f44..1cf344f 100644 ---- a/src/stdio/fputs.c -+++ b/src/stdio/fputs.c -@@ -3,7 +3,8 @@ - - int fputs(const char *restrict s, FILE *restrict f) - { -- return (int)fwrite(s, strlen(s), 1, f) - 1; -+ size_t l = strlen(s); -+ return (fwrite(s, 1, l, f)==l) - 1; - } - - weak_alias(fputs, fputs_unlocked); --- -2.4.10 - diff --git a/package/musl/musl.hash b/package/musl/musl.hash index 0970ad6b1a..907e9c6bd5 100644 --- a/package/musl/musl.hash +++ b/package/musl/musl.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 bbacdc64f557d0c4857f7d2daf592c32c29aec1babbb94fcf01a2e05bed15013 musl-1.1.13.tar.gz +sha256 35f6c00c84a6091bd5dab29eedde7508dae755ead92dcc0239f3677d1055b9b5 musl-1.1.14.tar.gz diff --git a/package/musl/musl.mk b/package/musl/musl.mk index d68e769e84..081a700286 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUSL_VERSION = 1.1.13 +MUSL_VERSION = 1.1.14 MUSL_SITE = http://www.musl-libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT From 0e5c9c2b35c71a3d3180c5829975dba5222b30c9 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 22 Feb 2016 10:20:59 +0100 Subject: [PATCH 113/206] docs/manual: add "python-package CFFI backend" section Signed-off-by: Yegor Yefremov [Thomas: formatting/redaction tweaks.] Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-python.txt | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt index 588dbf8ad5..9bbc9f3682 100644 --- a/docs/manual/adding-packages-python.txt +++ b/docs/manual/adding-packages-python.txt @@ -160,3 +160,43 @@ possible to customize what is done in any particular step: +PYTHON_FOO_BUILD_CMDS+ variable, it will be used instead of the default Python one. However, using this method should be restricted to very specific cases. Do not use it in the general case. + +[[python-package-cffi-backend]] + +==== +python-package+ CFFI backend + +C Foreign Function Interface for Python (CFFI) provides a convenient +and reliable way to call compiled C code from Python using interface +declarations written in C. Python packages relying on this backend can +be identified by the appearance of a +cffi+ dependency in the ++install_requires+ field of their +setup.py+ file. + +Such a package should: + + * add +python-cffi+ as a runtime dependency in order to install the +compiled C library wrapper on the target. This is achieved by adding ++select BR2_PACKAGE_PYTHON_CFFI+ to the package +Config.in+. + +------------------------ +config BR2_PACKAGE_PYTHON_FOO + bool "python-foo" + select BR2_PACKAGE_PYTHON_CFFI # runtime +------------------------ + + * add +host-python-cffi+ as a build-time dependency in order to +cross-compile the C wrapper. This is achieved by adding ++host-python-cffi+ to the +PYTHON_FOO_DEPENDENCIES+ variable. + +------------------------ +################################################################################ +# +# python-foo +# +################################################################################ + +... + +PYTHON_FOO_DEPENDENCIES = host-python-cffi + +$(eval $(python-package)) +------------------------ From 0cf5ac0e76cc20aac6278e4031eeced236b8f0c4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 23 Feb 2016 14:34:02 -0300 Subject: [PATCH 114/206] samba4: bump to version 4.3.5 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 2 +- package/samba4/samba4.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index f42e37a4ce..1b536577da 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 5d0eb52e842832af922f7d57716eacff23192906ec3bdf6727e18ca24f1419d9 samba-4.3.4.tar.gz +sha256 583f927a823b272757fd4df0be267bd20a223b06cfc3c662df17e4870f14bf1c samba-4.3.5.tar.gz diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 4e796a67f9..64f9957ced 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.3.4 +SAMBA4_VERSION = 4.3.5 SAMBA4_SITE = http://ftp.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From d0a1fc98477f5c81a41ee3e563a8ce71ef4c92a4 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 21 Feb 2016 22:01:28 +0100 Subject: [PATCH 115/206] qt53d: enable assimpsceneparser plugin - add hint to help text - add assimp dependency - always install the gltf (and any future) sceneparser to target. Signed-off-by: Peter Seiderer Acked-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Arnout Vandecappelle (Essensium/Mind) [Thomas: update commit message as suggested by Arnout.] Signed-off-by: Thomas Petazzoni --- package/qt5/qt53d/Config.in | 2 ++ package/qt5/qt53d/qt53d.mk | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/package/qt5/qt53d/Config.in b/package/qt5/qt53d/Config.in index b2d2912d5b..ff50204fc8 100644 --- a/package/qt5/qt53d/Config.in +++ b/package/qt5/qt53d/Config.in @@ -12,6 +12,8 @@ config BR2_PACKAGE_QT53D This package corresponds to the qt53d module. + Enable the assimp package to gain the assimp sceneparser plugin. + http://doc.qt.io/qt-5/qt3d-index.html comment "qt53d module needs an OpenGL-capable backend" diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index 810242b449..24c42e673d 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -10,6 +10,10 @@ QT53D_SOURCE = qt3d-opensource-src-$(QT5SVG_VERSION).tar.xz QT53D_DEPENDENCIES = qt5base qt5declarative QT53D_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_ASSIMP),y) +QT53D_DEPENDENCIES += assimp +endif + ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) QT53D_LICENSE = GPLv2+ or LGPLv3 QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.LGPLv3 @@ -34,6 +38,7 @@ endef ifeq ($(BR2_STATIC_LIBS),) define QT53D_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sceneparsers $(TARGET_DIR)/usr/lib/qt/plugins cp -dpfr $(STAGING_DIR)/usr/qml/Qt3D $(TARGET_DIR)/usr/qml endef endif From d6bddaec684a73a9d8bdd01d34efaea602cbcf3a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 22 Feb 2016 14:19:18 -0300 Subject: [PATCH 116/206] cantarell: bump to version 0.0.23 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/cantarell/cantarell.hash | 4 ++-- package/cantarell/cantarell.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cantarell/cantarell.hash b/package/cantarell/cantarell.hash index 5d8284df5b..2d2bab562e 100644 --- a/package/cantarell/cantarell.hash +++ b/package/cantarell/cantarell.hash @@ -1,2 +1,2 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.21.sha256sum -sha256 2d3e925574648f0902c61975f84acac445ee9cda826280644bdf772960b46e85 cantarell-fonts-0.0.21.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.23.sha256sum +sha256 d85e165ac5d676d6b21c7870d8243cb612a2dc766d91fda788d56d5f5ad5db4e cantarell-fonts-0.0.23.tar.xz diff --git a/package/cantarell/cantarell.mk b/package/cantarell/cantarell.mk index c677c78f4b..9943d70322 100644 --- a/package/cantarell/cantarell.mk +++ b/package/cantarell/cantarell.mk @@ -5,7 +5,7 @@ ################################################################################ CANTARELL_VERSION_MAJOR = 0.0 -CANTARELL_VERSION = $(CANTARELL_VERSION_MAJOR).21 +CANTARELL_VERSION = $(CANTARELL_VERSION_MAJOR).23 CANTARELL_SITE = http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/$(CANTARELL_VERSION_MAJOR) CANTARELL_SOURCE = cantarell-fonts-$(CANTARELL_VERSION).tar.xz CANTARELL_DEPENDENCIES = host-pkgconf From bca107ee6d010ec0f61526bd800a2beec9f82c23 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 22 Feb 2016 14:54:57 -0300 Subject: [PATCH 117/206] Config.in: Add BR2_DEPRECATED_SINCE_2016_05 In preparation for new deprecated features/symbols. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Config.in b/Config.in index 30e88e3a3c..dfb57217ea 100644 --- a/Config.in +++ b/Config.in @@ -365,6 +365,10 @@ config BR2_DEPRECATED_SINCE_2016_02 bool default y +config BR2_DEPRECATED_SINCE_2016_05 + bool + default y + endif config BR2_ENABLE_DEBUG From e81b166ec1744a6a5a6ebb87988441397db07d8a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 22 Feb 2016 14:54:58 -0300 Subject: [PATCH 118/206] linux-headers: mark EOL versions deprecated Follow the upstream EOL cycle and mark 4.3 as deprecated for 2016.05. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ad5ee2ea47..dc58637c93 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -73,6 +73,7 @@ choice config BR2_KERNEL_HEADERS_4_3 bool "Linux 4.3.x kernel headers" + depends on BR2_DEPRECATED_SINCE_2016_05 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 config BR2_KERNEL_HEADERS_4_4 From 6c49ae49d9cf42d29b31505054b79ea414c33480 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Mon, 22 Feb 2016 23:42:20 +0100 Subject: [PATCH 119/206] configs: add Boundary Devices i.MX7 Nitrogen7 support This board is using a different kernel and u-boot branch than the other Boundary Devices platforms since NXP forked the 3.14 kernel to add i.MX7 support (see imx_3.14.38_6ul7d_beta branch). Next kernel version, 3.14.52, will be the same for all i.MX platforms. https://boundarydevices.com/product/nitrogen7/ Signed-off-by: Gary Bisson Signed-off-by: Peter Korsgaard --- configs/nitrogen7_defconfig | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 configs/nitrogen7_defconfig diff --git a/configs/nitrogen7_defconfig b/configs/nitrogen7_defconfig new file mode 100644 index 0000000000..91529e82fc --- /dev/null +++ b/configs/nitrogen7_defconfig @@ -0,0 +1,36 @@ +# architecture +BR2_arm=y +BR2_cortex_a7=y + +# system +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/nitrogen6x/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/nitrogen6x/post-image.sh" +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y + +# filesystem +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Linux headers same as kernel, a 3.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y + +# bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="nitrogen7" +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/b2e1315/u-boot-b2e1315.tar.gz" + +# kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/tarball/20cee23/linux-imx6-20cee23.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_ZIMAGE=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-nitrogen7" From 007c2ce917199339c0876227c2e612b11f8e7e15 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 8 Feb 2016 20:56:41 +0100 Subject: [PATCH 120/206] package/sqlite: add optional support for libedit Reviewed-by: "Yann E. MORIN" Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 11 +++++++++++ package/sqlite/Config.in | 7 ------- package/sqlite/sqlite.mk | 9 ++++++--- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 3677f867d5..0ea8c7d8d1 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,17 @@ endif ############################################################################### comment "Legacy options removed in 2016.02" +config BR2_PACKAGE_SQLITE_READLINE + bool "command-line editing support was updated" + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_READLINE + select BR2_LEGACY + help + This option was removed in favour of the sqlite package + deciding itself depending on the enabled packages whether + command-line editing should be enabled, it also also takes + libedit into account. + config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL bool "openpowerlink debug option has been removed" select BR2_LEGACY diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in index 7ea9eb15b8..c9fde53b36 100644 --- a/package/sqlite/Config.in +++ b/package/sqlite/Config.in @@ -8,13 +8,6 @@ config BR2_PACKAGE_SQLITE if BR2_PACKAGE_SQLITE -config BR2_PACKAGE_SQLITE_READLINE - bool "Command-line editing" - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_READLINE - help - Enable command-line editing. This requires ncurses and readline. - config BR2_PACKAGE_SQLITE_STAT3 bool "Additional query optimizations (stat3)" help diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 0a119cc30e..870b891c4f 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -45,11 +45,14 @@ else SQLITE_CONF_OPTS += --disable-threadsafe endif -ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y) +ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_READLINE),yy) SQLITE_DEPENDENCIES += ncurses readline -SQLITE_CONF_OPTS += --enable-readline +SQLITE_CONF_OPTS += --disable-editline --enable-readline +else ifeq ($(BR2_PACKAGE_LIBEDIT),y) +SQLITE_DEPENDENCIES += libedit +SQLITE_CONF_OPTS += --enable-editline --disable-readline else -SQLITE_CONF_OPTS += --disable-readline +SQLITE_CONF_OPTS += --disable-editline --disable-readline endif $(eval $(autotools-package)) From fd5bcd0eda8fb21f639c34a09b212e6f9b066a04 Mon Sep 17 00:00:00 2001 From: Sam bobroff Date: Thu, 28 Jan 2016 14:51:23 +1100 Subject: [PATCH 121/206] package/glibc: set --enable-kernel to match kernel Glibc is currently configured without any "--enable-kernel" option. This causes it to use the oldest possible kernel API, slowing it down and preventing it from using any kernel features from later versions. Since we are likely building a kernel and matching glibc together, backwards compatability is probably unnecessary so this patch unconditionally configures glibc with --enable-kernel set to BR2_TOOLCHAIN_HEADERS_AT_LEAST. Signed-off-by: Sam Bobroff Tested-by: Stewart Smith Signed-off-by: Thomas Petazzoni --- package/glibc/glibc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index e60575f62b..4a9ba0ea4e 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -96,6 +96,7 @@ define GLIBC_CONFIGURE_CMDS --disable-profile \ --without-gd \ --enable-obsolete-rpc \ + --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ --with-headers=$(STAGING_DIR)/usr/include) $(GLIBC_ADD_MISSING_STUB_H) endef From 52b054fb3e14192ed94627a2b4eb2d96c557501e Mon Sep 17 00:00:00 2001 From: Ian Haylock Date: Sat, 9 Jan 2016 09:24:56 +0000 Subject: [PATCH 122/206] python-rpi-gpio: new package Signed-off-by: Ian Haylock Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-rpi-gpio/Config.in | 7 +++++++ package/python-rpi-gpio/python-rpi-gpio.hash | 3 +++ package/python-rpi-gpio/python-rpi-gpio.mk | 14 ++++++++++++++ 4 files changed, 25 insertions(+) create mode 100755 package/python-rpi-gpio/Config.in create mode 100755 package/python-rpi-gpio/python-rpi-gpio.hash create mode 100755 package/python-rpi-gpio/python-rpi-gpio.mk diff --git a/package/Config.in b/package/Config.in index dc6818436c..2b181479b8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -717,6 +717,7 @@ menu "External python modules" source "package/python-pyyaml/Config.in" source "package/python-pyzmq/Config.in" source "package/python-requests/Config.in" + source "package/python-rpi-gpio/Config.in" source "package/python-rtslib-fb/Config.in" source "package/python-serial/Config.in" source "package/python-service-identity/Config.in" diff --git a/package/python-rpi-gpio/Config.in b/package/python-rpi-gpio/Config.in new file mode 100755 index 0000000000..4f59ebdb06 --- /dev/null +++ b/package/python-rpi-gpio/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_RPI_GPIO + bool "python-rpi-gpio" + depends on BR2_arm + help + A Python module to control the GPIO on a Raspberry Pi. + + http://sourceforge.net/p/raspberry-gpio-python diff --git a/package/python-rpi-gpio/python-rpi-gpio.hash b/package/python-rpi-gpio/python-rpi-gpio.hash new file mode 100755 index 0000000000..8b498f1f13 --- /dev/null +++ b/package/python-rpi-gpio/python-rpi-gpio.hash @@ -0,0 +1,3 @@ +# md5sum from http://sourceforge.net/projects/raspberry-gpio-python/files/, sha256 calculated locally +md5 254d0443a436eb241367c487274e7197 RPi.GPIO-0.6.1.tar.gz +sha256 54e5fb06d9ea1a1389a497fb5a06dfa950c86303b0f4ba89b68c55999d1df064 RPi.GPIO-0.6.1.tar.gz diff --git a/package/python-rpi-gpio/python-rpi-gpio.mk b/package/python-rpi-gpio/python-rpi-gpio.mk new file mode 100755 index 0000000000..e71fdeabcd --- /dev/null +++ b/package/python-rpi-gpio/python-rpi-gpio.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-rpi-gpio +# +################################################################################ + +PYTHON_RPI_GPIO_VERSION = 0.6.1 +PYTHON_RPI_GPIO_SOURCE = RPi.GPIO-$(PYTHON_RPI_GPIO_VERSION).tar.gz +PYTHON_RPI_GPIO_SITE = http://sourceforge.net/projects/raspberry-gpio-python/files +PYTHON_RPI_GPIO_LICENSE = MIT +PYTHON_RPI_GPIO_LICENSE_FILES = LICENSE.txt +PYTHON_RPI_GPIO_SETUP_TYPE = distutils + +$(eval $(python-package)) From ad8358599649bc336ee17a1fc02a0ca350d1352b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 24 Feb 2016 10:38:16 -0300 Subject: [PATCH 123/206] sdparm: bump to version 1.10 0000-makefile-remove-host-headers-include.patch is upstream so remove it and drop autoreconf. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...makefile-remove-host-headers-include.patch | 19 ------------------- package/sdparm/sdparm.hash | 2 +- package/sdparm/sdparm.mk | 5 +---- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 package/sdparm/0000-makefile-remove-host-headers-include.patch diff --git a/package/sdparm/0000-makefile-remove-host-headers-include.patch b/package/sdparm/0000-makefile-remove-host-headers-include.patch deleted file mode 100644 index 765a81d16b..0000000000 --- a/package/sdparm/0000-makefile-remove-host-headers-include.patch +++ /dev/null @@ -1,19 +0,0 @@ -src/Makefile.am: remove host headers incdlue - -Using host headers is bad for cross compilation. Instead, use the '=' prefix -which expands to the current sysroot. - -Signed-off-by: Baruch Siach ---- -diff -Nuar sdparm-1.09-orig/src/Makefile.am sdparm-1.09/src/Makefile.am ---- sdparm-1.09-orig/src/Makefile.am 2014-09-23 18:48:44.000000000 +0300 -+++ sdparm-1.09/src/Makefile.am 2015-02-06 09:33:43.693477667 +0200 -@@ -41,7 +41,7 @@ - ../lib/sg_pt_common.c - - if HAVE_SGUTILS --INCLUDES = -I/usr/include/scsi -+INCLUDES = -I=/scsi - sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@ - sdparm_DEPENDENCIES = @GETOPT_O_FILES@ - else diff --git a/package/sdparm/sdparm.hash b/package/sdparm/sdparm.hash index ff5e7b6457..050785ab71 100644 --- a/package/sdparm/sdparm.hash +++ b/package/sdparm/sdparm.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0f5e07438ef56e045443bd827008a38076e029558b00adbfc45f9cc8a5c75349 sdparm-1.09.tar.xz +sha256 7dc9e148cef22744e00809dad21b59ac544e3615001bc1b2399978f73e1d58ca sdparm-1.10.tar.xz diff --git a/package/sdparm/sdparm.mk b/package/sdparm/sdparm.mk index 9fc20674d0..ed1606c1cf 100644 --- a/package/sdparm/sdparm.mk +++ b/package/sdparm/sdparm.mk @@ -4,15 +4,12 @@ # ################################################################################ -SDPARM_VERSION = 1.09 +SDPARM_VERSION = 1.10 SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tar.xz SDPARM_SITE = http://sg.danny.cz/sg/p SDPARM_LICENSE = BSD-3c SDPARM_LICENSE_FILES = COPYING -# Patching src/Makefile.am -SDPARM_AUTORECONF = YES - ifeq ($(BR2_PACKAGE_SG3_UTILS),y) SDPARM_DEPENDENCIES += sg3_utils else From 04f416df91109f75f393820fa924db4a8f257326 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 24 Feb 2016 15:00:39 -0300 Subject: [PATCH 124/206] gcc: mark 4.7.x as deprecated We're already using 4.9.x as default, and have 4.8.x on the lower side together with 5.x (5.3.0) on the higher side. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gcc/Config.in.host | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 560ea52104..5cc0dd3bdd 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -41,6 +41,7 @@ choice config BR2_GCC_VERSION_4_7_X bool "gcc 4.7.x" + depends on BR2_DEPRECATED_SINCE_2016_05 # Broken or unsupported architectures depends on !BR2_microblaze && !BR2_aarch64 && !BR2_arc \ && !BR2_powerpc64le && !BR2_nios2 From 25e5f788b34806b859045979cade771bef1f3e9f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 24 Feb 2016 15:33:01 -0300 Subject: [PATCH 125/206] sysstat: bump to version 11.2.1.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/sysstat/sysstat.hash | 2 +- package/sysstat/sysstat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash index d69440b6ae..37142580a4 100644 --- a/package/sysstat/sysstat.hash +++ b/package/sysstat/sysstat.hash @@ -1,2 +1,2 @@ # From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 61b70892d864f8bac5714e2fe0a006f0fda6efba sysstat-11.2.0.tar.xz +sha1 01dd5212efff6eff6f9018711de3de471516060e sysstat-11.2.1.1.tar.xz diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index ba0eb26f99..449c30aa9a 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSSTAT_VERSION = 11.2.0 +SYSSTAT_VERSION = 11.2.1.1 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard SYSSTAT_CONF_OPTS = --disable-man-group --disable-sensors From 937568ea4db373f7acc649a3668386809245ea36 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Tue, 23 Feb 2016 01:24:25 +0100 Subject: [PATCH 126/206] olimex/a20_olinuxino: update readme.txt with lime2 info [Peter: fix typo, s/AllWinner/Allwinner/] Signed-off-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- board/olimex/a20_olinuxino/readme.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/board/olimex/a20_olinuxino/readme.txt b/board/olimex/a20_olinuxino/readme.txt index 7998aa12e6..485bf5668f 100644 --- a/board/olimex/a20_olinuxino/readme.txt +++ b/board/olimex/a20_olinuxino/readme.txt @@ -3,12 +3,13 @@ A20-OLinuXino-LIME and A20-OLinuXino-MICRO Intro ===== -These are open hardware boards, both based an the AllWinners A20 SoC. +These are open hardware boards, all based on the Allwinner A20 SoC. for more details about the boards see the following pages: - https://www.olimex.com/Products/OLinuXino/open-source-hardware - https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXino-MICRO/ - https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXino-LIME/ + - https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXino-LIME2/ The following defconfigs are available: - olimex_a20_olinuxino_micro_defconfig From 812b25fd0045ec36385a72a782ef57e3102248e2 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Tue, 23 Feb 2016 01:24:26 +0100 Subject: [PATCH 127/206] olimex_a20_olinuxino_micro: bump linux to 4.4.2 Signed-off-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_micro_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/olimex_a20_olinuxino_micro_defconfig b/configs/olimex_a20_olinuxino_micro_defconfig index da2fd8a43a..a641ad7d26 100644 --- a/configs/olimex_a20_olinuxino_micro_defconfig +++ b/configs/olimex_a20_olinuxino_micro_defconfig @@ -4,8 +4,8 @@ BR2_cortex_a7=y BR2_ARM_EABIHF=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 4.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_0=y +# Linux headers same as kernel, a 4.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot.cmd $(TARGET_DIR)/b # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.0.5" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.2" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_ZIMAGE=y From d03c73d588862abee3d7bb30c0deb0da3cc3afcb Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Tue, 23 Feb 2016 01:24:27 +0100 Subject: [PATCH 128/206] olimex_a20_olinuxino_micro: bump u-boot to 2016.01 Signed-off-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_micro_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/olimex_a20_olinuxino_micro_defconfig b/configs/olimex_a20_olinuxino_micro_defconfig index a641ad7d26..6d05f74bea 100644 --- a/configs/olimex_a20_olinuxino_micro_defconfig +++ b/configs/olimex_a20_olinuxino_micro_defconfig @@ -35,7 +35,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="A20-OLinuXino_MICRO" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.01" +BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" From 9faedd8d5ccd1866d195209a07f147e32ede94ce Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Tue, 23 Feb 2016 01:24:28 +0100 Subject: [PATCH 129/206] olimex_a20_olinuxino_micro: initialize the network with DHCP To allow a more complete "out-of-the-box" startup with the defconfig, enable automatic network configuration of eth0 using DHCP. Signed-off-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_micro_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_a20_olinuxino_micro_defconfig b/configs/olimex_a20_olinuxino_micro_defconfig index 6d05f74bea..420252c2c3 100644 --- a/configs/olimex_a20_olinuxino_micro_defconfig +++ b/configs/olimex_a20_olinuxino_micro_defconfig @@ -12,6 +12,7 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot.cmd $(TARGET_DIR)/boot" From ad009b6b95d9f0c67d6027247008d2baf422c8e3 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Tue, 23 Feb 2016 01:24:29 +0100 Subject: [PATCH 130/206] olimex_a20_olinuxino_micro: remove redundant defconfig lines These defconfig options are set to their default values, so they are redundant and can be removed without effect. Signed-off-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_micro_defconfig | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configs/olimex_a20_olinuxino_micro_defconfig b/configs/olimex_a20_olinuxino_micro_defconfig index 420252c2c3..f84da343eb 100644 --- a/configs/olimex_a20_olinuxino_micro_defconfig +++ b/configs/olimex_a20_olinuxino_micro_defconfig @@ -1,7 +1,6 @@ # Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_EABIHF=y BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 4.4 series @@ -10,7 +9,6 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" -BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" @@ -20,7 +18,6 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot.cmd $(TARGET_DIR)/b BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.2" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_ZIMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -38,7 +35,6 @@ BR2_TARGET_UBOOT_BOARDNAME="A20-OLinuXino_MICRO" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.01" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" From 92b5fb868cac99b6915bee2a718e75c0509c24a6 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 24 Feb 2016 17:33:07 -0300 Subject: [PATCH 131/206] libnspr: bump to version 4.12 Drop 0003-enable-internal-getproto-functions-for-musl.patch since it's no longer required (tested via a flickcurl build with libnss against mips-musl). Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...internal-getproto-functions-for-musl.patch | 35 ------------------- package/libnspr/libnspr.hash | 4 +-- package/libnspr/libnspr.mk | 2 +- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 package/libnspr/0003-enable-internal-getproto-functions-for-musl.patch diff --git a/package/libnspr/0003-enable-internal-getproto-functions-for-musl.patch b/package/libnspr/0003-enable-internal-getproto-functions-for-musl.patch deleted file mode 100644 index 860ca2ad28..0000000000 --- a/package/libnspr/0003-enable-internal-getproto-functions-for-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c950bcf9cc7bdc68ed9751a1b7d04f4b4c2a9fb0 Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Tue, 5 Jan 2016 21:15:34 -0200 -Subject: [PATCH] enable internal getproto functions for musl - -Musl toolchains does not have getprotobyname_r and getprotobynumber_r -functions and need its internal implementation. - -Patch backported from Alpine Linux commit -a162da839db0d3f8be94a5c1ad2e2e54e691c38a. - -Signed-off-by: Sergio Prado ---- - nspr/pr/src/misc/prnetdb.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/nspr/pr/src/misc/prnetdb.c b/nspr/pr/src/misc/prnetdb.c -index b86248f863f0..dc83a5615f45 100644 ---- a/nspr/pr/src/misc/prnetdb.c -+++ b/nspr/pr/src/misc/prnetdb.c -@@ -61,10 +61,7 @@ PRLock *_pr_dnsLock = NULL; - #define _PR_HAVE_GETPROTO_R_POINTER - #endif - --#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \ -- || (defined(LINUX) && defined(_REENTRANT) \ -- && !(defined(__GLIBC__) && __GLIBC__ >= 2) \ -- && !defined(ANDROID)) -+#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) - #define _PR_HAVE_GETPROTO_R - #define _PR_HAVE_GETPROTO_R_POINTER - #endif --- -1.9.1 - diff --git a/package/libnspr/libnspr.hash b/package/libnspr/libnspr.hash index 87f6d4fafa..f513213d25 100644 --- a/package/libnspr/libnspr.hash +++ b/package/libnspr/libnspr.hash @@ -1,2 +1,2 @@ -# From https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.11/src/SHA256SUMS -sha256 cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2 nspr-4.11.tar.gz +# From https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.12/src/SHA256SUMS +sha256 e0b10a1e569153668ff8bdea6c7e491b389fab69c2f18285a1ebf7c2ea4269de nspr-4.12.tar.gz diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index 9f49eef918..0311f8fc98 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.11 +LIBNSPR_VERSION = 4.12 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src LIBNSPR_SUBDIR = nspr From 6b63783dafe1e797a9aab8c98e2ec39de70e6ae6 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 24 Feb 2016 17:33:08 -0300 Subject: [PATCH 132/206] libnss: bump to version 4.22.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 4fa5897b57..6e4d330f49 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,2 +1,2 @@ -# From https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/SHA256SUMS -sha256 3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239 nss-3.21.tar.gz +# From https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_22_1_RTM/src/SHA256SUMS +sha256 89e1fc7074e5c325962821289f4cd7d8207ae95af2308ba881215ed9ca68fa4f nss-3.22.1.tar.gz diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 6fdb77cd14..c474f61f23 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.21 +LIBNSS_VERSION = 3.22.1 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From eec7853b253ff02b9ff44ec972ba165e5b56cd22 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 24 Feb 2016 18:25:01 -0300 Subject: [PATCH 133/206] debianutils: bump to version 4.7 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/debianutils/debianutils.hash | 4 ++-- package/debianutils/debianutils.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/debianutils/debianutils.hash b/package/debianutils/debianutils.hash index 43f122501c..4d1b57403f 100644 --- a/package/debianutils/debianutils.hash +++ b/package/debianutils/debianutils.hash @@ -1,2 +1,2 @@ -# From http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_4.5.1.dsc -sha256 a531c23e0105fe01cfa928457a8343a1e947e2621b3cd4d05f4e9656020c63b7 debianutils_4.5.1.tar.xz +# From http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_4.7.dsc +sha256 a269cacd40f52f2fa5d5636357714a49e8538459c16d77772efaa23711fe53d9 debianutils_4.7.tar.xz diff --git a/package/debianutils/debianutils.mk b/package/debianutils/debianutils.mk index 5c785049b4..17f0240e84 100644 --- a/package/debianutils/debianutils.mk +++ b/package/debianutils/debianutils.mk @@ -4,9 +4,9 @@ # ################################################################################ -DEBIANUTILS_VERSION = 4.5.1 +DEBIANUTILS_VERSION = 4.7 DEBIANUTILS_SOURCE = debianutils_$(DEBIANUTILS_VERSION).tar.xz -DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20150526T034723Z/pool/main/d/debianutils +DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20160126T220153Z/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) From 9ca923bd18495b60c1c782b1cb8dca40b7020f4c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 24 Feb 2016 18:25:02 -0300 Subject: [PATCH 134/206] ifupdown: bump to version 0.8.10 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/ifupdown/ifupdown.hash | 4 ++-- package/ifupdown/ifupdown.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ifupdown/ifupdown.hash b/package/ifupdown/ifupdown.hash index c5a4189f62..cd180add67 100644 --- a/package/ifupdown/ifupdown.hash +++ b/package/ifupdown/ifupdown.hash @@ -1,2 +1,2 @@ -# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.8.8.dsc -sha256 180edaaa6de99e4e74de7229481edf74361b8e8468462842618a42a952a26c0e ifupdown_0.8.8.tar.xz +# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.8.10.dsc +sha256 d4730441b9234e5dcaab7dd688ad48ec17e130d1534a357b1c4fff13cf741b0c ifupdown_0.8.10.tar.xz diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk index 37aaf5da09..1421a67e6a 100644 --- a/package/ifupdown/ifupdown.mk +++ b/package/ifupdown/ifupdown.mk @@ -4,9 +4,9 @@ # ################################################################################ -IFUPDOWN_VERSION = 0.8.8 +IFUPDOWN_VERSION = 0.8.10 IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz -IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160113T035819Z/pool/main/i/ifupdown +IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160122T224509Z/pool/main/i/ifupdown IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) IFUPDOWN_LICENSE = GPLv2+ IFUPDOWN_LICENSE_FILES = COPYING From 316215a746f59f9ffcbc39d3a1475f432e02dd27 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Tue, 23 Feb 2016 01:24:30 +0100 Subject: [PATCH 135/206] olimex_a20_olinuxino_micro: update to use genimage Signed-off-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- board/olimex/a20_olinuxino/genimage.cfg | 16 ++++++++++++++++ board/olimex/a20_olinuxino/post-image.sh | 16 ++++++++++++++++ board/olimex/a20_olinuxino/readme.txt | 17 +++++++++++++++-- configs/olimex_a20_olinuxino_micro_defconfig | 2 ++ 4 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 board/olimex/a20_olinuxino/genimage.cfg create mode 100755 board/olimex/a20_olinuxino/post-image.sh diff --git a/board/olimex/a20_olinuxino/genimage.cfg b/board/olimex/a20_olinuxino/genimage.cfg new file mode 100644 index 0000000000..8ea24ccab8 --- /dev/null +++ b/board/olimex/a20_olinuxino/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/olimex/a20_olinuxino/post-image.sh b/board/olimex/a20_olinuxino/post-image.sh new file mode 100755 index 0000000000..9cca1b1789 --- /dev/null +++ b/board/olimex/a20_olinuxino/post-image.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/board/olimex/a20_olinuxino/readme.txt b/board/olimex/a20_olinuxino/readme.txt index 485bf5668f..febfbe7f73 100644 --- a/board/olimex/a20_olinuxino/readme.txt +++ b/board/olimex/a20_olinuxino/readme.txt @@ -52,6 +52,7 @@ After building, you should get a tree like this: +-- rootfs.ext2 +-- rootfs.ext4 -> rootfs.ext2 +-- script.bin (lime_mali) + +-- sdcard.img (micro) +-- sun7i-a20-olinuxino-lime.dtb (lime, mainline) +-- sun7i-a20-olinuxino-lime2.dtb (lime2, mainline) +-- sun7i-a20-olinuxino-micro.dtb (micro, mainline) @@ -60,8 +61,20 @@ After building, you should get a tree like this: `-- zImage -How to write the SD card -======================== +How to write the SD card - boards with sdcard.img +================================================= + +The sdcard.img file is a complete bootable image ready to be written +on the boot medium. To install it, simply copy the image to a uSD +card: + + # dd if=output/images/sdcard.img of=/dev/sdX + +Where 'sdX' is the device node of the uSD. + + +How to write the SD card - other boards +======================================= Prepare the SD card diff --git a/configs/olimex_a20_olinuxino_micro_defconfig b/configs/olimex_a20_olinuxino_micro_defconfig index f84da343eb..3574a75baf 100644 --- a/configs/olimex_a20_olinuxino_micro_defconfig +++ b/configs/olimex_a20_olinuxino_micro_defconfig @@ -12,6 +12,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/olimex/a20_olinuxino/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot.cmd $(TARGET_DIR)/boot" # Kernel @@ -39,4 +40,5 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" # Additional tools +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y From 65301a472e939eb9ebd1a992cdd0cda60ad33fbb Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Tue, 23 Feb 2016 01:24:31 +0100 Subject: [PATCH 136/206] olimex_a20_olinuxino_lime: update to use genimage Signed-off-by: Luca Ceresoli Cc: Francois Perrad Tested-by: Francois Perrad Signed-off-by: Peter Korsgaard --- board/olimex/a20_olinuxino/readme.txt | 2 +- configs/olimex_a20_olinuxino_lime_defconfig | 2 ++ configs/olimex_a20_olinuxino_lime_mali_defconfig | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/board/olimex/a20_olinuxino/readme.txt b/board/olimex/a20_olinuxino/readme.txt index febfbe7f73..8be1bf4021 100644 --- a/board/olimex/a20_olinuxino/readme.txt +++ b/board/olimex/a20_olinuxino/readme.txt @@ -52,7 +52,7 @@ After building, you should get a tree like this: +-- rootfs.ext2 +-- rootfs.ext4 -> rootfs.ext2 +-- script.bin (lime_mali) - +-- sdcard.img (micro) + +-- sdcard.img (micro, lime) +-- sun7i-a20-olinuxino-lime.dtb (lime, mainline) +-- sun7i-a20-olinuxino-lime2.dtb (lime2, mainline) +-- sun7i-a20-olinuxino-micro.dtb (micro, mainline) diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index e6c33c82d9..b2127672d7 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -12,6 +12,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/olimex/a20_olinuxino/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot.cmd $(TARGET_DIR)/boot" # Kernel @@ -41,4 +42,5 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" # Additional tools +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/olimex_a20_olinuxino_lime_mali_defconfig b/configs/olimex_a20_olinuxino_lime_mali_defconfig index ca71b55bcf..737c690930 100644 --- a/configs/olimex_a20_olinuxino_lime_mali_defconfig +++ b/configs/olimex_a20_olinuxino_lime_mali_defconfig @@ -12,6 +12,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/olimex/a20_olinuxino/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot-mali.cmd $(TARGET_DIR)/boot" # Kernel @@ -45,4 +46,5 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" # Additional tools +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y From ae13fd947b0e844da5b806acaf5301ecb223e78b Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Tue, 23 Feb 2016 01:24:32 +0100 Subject: [PATCH 137/206] olimex_a20_olinuxino_lime2: update to use genimage Signed-off-by: Luca Ceresoli Cc: Jan Viktorin Signed-off-by: Peter Korsgaard --- board/olimex/a20_olinuxino/readme.txt | 2 +- configs/olimex_a20_olinuxino_lime2_defconfig | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/board/olimex/a20_olinuxino/readme.txt b/board/olimex/a20_olinuxino/readme.txt index 8be1bf4021..d6871ce2e2 100644 --- a/board/olimex/a20_olinuxino/readme.txt +++ b/board/olimex/a20_olinuxino/readme.txt @@ -52,7 +52,7 @@ After building, you should get a tree like this: +-- rootfs.ext2 +-- rootfs.ext4 -> rootfs.ext2 +-- script.bin (lime_mali) - +-- sdcard.img (micro, lime) + +-- sdcard.img +-- sun7i-a20-olinuxino-lime.dtb (lime, mainline) +-- sun7i-a20-olinuxino-lime2.dtb (lime2, mainline) +-- sun7i-a20-olinuxino-micro.dtb (micro, mainline) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 1a2bb458dd..1e3fa4a1d2 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -7,6 +7,7 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/olimex/a20_olinuxino/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot.cmd $(TARGET_DIR)/boot" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y @@ -28,4 +29,5 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y From a59dc492f0d7ddfc2d93b856a97288aece6b3c4c Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Tue, 23 Feb 2016 01:24:33 +0100 Subject: [PATCH 138/206] olimex_a20_olinuxino_*: remove old SD writing instructions Now that all the boards have been converted to use genimage, the old instructions on how to partition and write an SD card are useless. Signed-off-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- board/olimex/a20_olinuxino/readme.txt | 58 +-------------------------- 1 file changed, 2 insertions(+), 56 deletions(-) diff --git a/board/olimex/a20_olinuxino/readme.txt b/board/olimex/a20_olinuxino/readme.txt index d6871ce2e2..070b7a5ec7 100644 --- a/board/olimex/a20_olinuxino/readme.txt +++ b/board/olimex/a20_olinuxino/readme.txt @@ -61,8 +61,8 @@ After building, you should get a tree like this: `-- zImage -How to write the SD card - boards with sdcard.img -================================================= +How to write the SD card +======================== The sdcard.img file is a complete bootable image ready to be written on the boot medium. To install it, simply copy the image to a uSD @@ -72,59 +72,5 @@ card: Where 'sdX' is the device node of the uSD. - -How to write the SD card - other boards -======================================= - - -Prepare the SD card -------------------- - -Erase existing stuff, and create an unique Linux partition with `fdisk`. - - # fdisk /dev/sdX - Command (m for help): o - Building a new DOS disklabel with disk identifier 0xf9e1616a. - Changes will remain in memory only, until you decide to write them. - After that, of course, the previous content won't be recoverable. - - Command (m for help): n - Partition type: - p primary (0 primary, 0 extended, 4 free) - e extended - Select (default p): p - Partition number (1-4, default 1): 1 - First sector (2048-7626751, default 2048): 2048 - Last sector, +sectors or +size{K,M,G} (2048-7626751, default 7626751): - Using default value 7626751 - - Command (m for help): p - - Disk /dev/sdX: 3904 MB, 3904897024 bytes - 4 heads, 16 sectors/track, 119168 cylinders, total 7626752 sectors - Units = sectors of 1 * 512 = 512 bytes - Sector size (logical/physical): 512 bytes / 512 bytes - I/O size (minimum/optimal): 512 bytes / 512 bytes - Disk identifier: 0xf9e1616a - - Device Boot Start End Blocks Id System - /dev/sdX1 2048 7626751 3812352 83 Linux - - Command (m for help): w - The partition table has been altered! - - Calling ioctl() to re-read partition table. - Syncing disks. - -Copy images on the SD card --------------------------- - - # dd if=output/images/rootfs.ext2 of=/dev/sdX1 - # dd if=output/images/u-boot-sunxi-with-spl.bin of=/dev/sdX bs=1024 seek=8 - - -Finish -====== - Eject the SD card, insert it in the A20-OLinuXino board, and power it up. From 30e991a0826f862c0b9b6e61fc498ca7358ef1d8 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 25 Feb 2016 10:14:52 +0000 Subject: [PATCH 139/206] package/ca-certificates: bump version to 20160104 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The following certificate authorities were added (+): + "CA WoSign ECC Root" + "Certification Authority of WoSign G2" + "Certinomis - Root CA" + "OISTE WISeKey Global Root GB CA" + "TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5" + "TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6" The following certificate authorities were removed (-): - "A-Trust-nQual-03" - "Buypass Class 3 CA 1" - "ComSign Secured CA" - "Digital Signature Trust Co. Global CA 1" - "Digital Signature Trust Co. Global CA 3" - "SG TRUST SERVICES RACINE" - "TC TrustCenter Class 2 CA II" - "TC TrustCenter Universal CA I" - "TURKTRUST Certificate Services Provider Root 1" - "TURKTRUST Certificate Services Provider Root 2" - "UTN DATACorp SGC Root CA" - "Verisign Class 4 Public Primary Certification Authority - G3" Signed-off-by: Martin Bark Signed-off-by: Peter Korsgaard --- package/ca-certificates/ca-certificates.hash | 4 ++-- package/ca-certificates/ca-certificates.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ca-certificates/ca-certificates.hash b/package/ca-certificates/ca-certificates.hash index 06120f5e5e..b467316872 100644 --- a/package/ca-certificates/ca-certificates.hash +++ b/package/ca-certificates/ca-certificates.hash @@ -1,3 +1,3 @@ # hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc : -sha1 c2d7ae81e28ff1f8a6b9ef7602c4e756ff08503c ca-certificates_20150426.tar.xz -sha256 37dbaa93ed64cc4ae93ac295f9248fbc741bd51376438cfb1257f17efab5494f ca-certificates_20150426.tar.xz +sha1 4525a194736c6691dbd59fa87281b722837b4768 ca-certificates_20160104.tar.xz +sha256 09eb770122e23260316120c0cbbddc8a1d33e7147210ce44e146084d5d5abcdd ca-certificates_20160104.tar.xz diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index b64120e54e..da1b70d893 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -4,9 +4,9 @@ # ################################################################################ -CA_CERTIFICATES_VERSION = 20150426 +CA_CERTIFICATES_VERSION = 20160104 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz -CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20150528T221654Z/pool/main/c/ca-certificates +CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20160104T220912Z/pool/main/c/ca-certificates CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python CA_CERTIFICATES_LICENSE = GPLv2+ (script), MPLv2.0 (data) CA_CERTIFICATES_LICENSE_FILES = debian/copyright From 53ac75b00eec46907401779a3a59988fd3be4cb5 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 25 Feb 2016 09:17:36 -0300 Subject: [PATCH 140/206] mpd: bump to version 0.19.13 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 bc4792ad37..85c99bed83 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 7b6fe6c7ce72f5f80a276d680072b524ecb395e546e252b8f3a0756377e1e875 mpd-0.19.12.tar.xz +sha256 f1014838fa7ab2d5fe2ef7f4c101d58fdec2c4c13cfbd2462ee146c8e4919a55 mpd-0.19.13.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index d5d77a638c..170a27ff97 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).12 +MPD_VERSION = $(MPD_VERSION_MAJOR).13 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 b7993116ab530e7100b08dc5ee9eefff3a651496 Mon Sep 17 00:00:00 2001 From: Paulo Zaneti Date: Thu, 25 Feb 2016 11:19:01 -0300 Subject: [PATCH 141/206] uboot-tools: add option for dumpimage The tool dumpimage extracts data from U-Boot images. U-Boot added dumpimage tool on release 2014.01. This commit allows installation on target and host. Signed-off-by: Paulo Zaneti Tested-by: Carlos Santos Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/uboot-tools/Config.in | 6 ++++++ package/uboot-tools/uboot-tools.mk | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/package/uboot-tools/Config.in b/package/uboot-tools/Config.in index e2c621c196..aca310bfe3 100644 --- a/package/uboot-tools/Config.in +++ b/package/uboot-tools/Config.in @@ -53,4 +53,10 @@ config BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV bootloader, which allows access to the U-Boot environment from Linux. +config BR2_PACKAGE_UBOOT_TOOLS_DUMPIMAGE + bool "dumpimage" + help + The dumpimage tool from Das U-Boot bootloader, which allows + extraction of data from U-Boot images. + endif diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 3150279397..264e9dd2c2 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -52,10 +52,17 @@ define UBOOT_TOOLS_INSTALL_FWPRINTENV endef endif +ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_DUMPIMAGE),y) +define UBOOT_TOOLS_INSTALL_DUMPIMAGE + $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(TARGET_DIR)/usr/sbin/dumpimage +endef +endif + define UBOOT_TOOLS_INSTALL_TARGET_CMDS $(UBOOT_TOOLS_INSTALL_MKIMAGE) $(UBOOT_TOOLS_INSTALL_MKENVIMAGE) $(UBOOT_TOOLS_INSTALL_FWPRINTENV) + $(UBOOT_TOOLS_INSTALL_DUMPIMAGE) endef ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),y) @@ -79,6 +86,7 @@ endef define HOST_UBOOT_TOOLS_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin/mkimage $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/usr/bin/mkenvimage + $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/usr/bin/dumpimage endef $(eval $(generic-package)) From eae103ea242af87dbde787837e672f471b10929c Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 25 Feb 2016 13:23:32 +0000 Subject: [PATCH 142/206] package/iputils: removed dependency on openssl iputils does not have to be built with openssl so remove selecting BR2_PACKAGE_OPENSSL and make the dependency optional Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/iputils/Config.in | 1 - package/iputils/iputils.mk | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/iputils/Config.in b/package/iputils/Config.in index 40580d2365..c83e414cce 100644 --- a/package/iputils/Config.in +++ b/package/iputils/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_IPUTILS bool "iputils" - select BR2_PACKAGE_OPENSSL depends on BR2_USE_MMU # fork() help This package is set of small useful utilities for Linux networking. diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 6392decfd3..953f1f552c 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -16,7 +16,6 @@ IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) IPUTILS_LICENSE = GPLv2+, BSD-3c, BSD-4c # Only includes a license file for BSD IPUTILS_LICENSE_FILES = ninfod/COPYING -IPUTILS_DEPENDENCIES = openssl # Build after busybox so target ends up with this package's full # versions of the applications instead of busybox applets. @@ -34,6 +33,13 @@ else IPUTILS_MAKE_OPTS += USE_CAP=no endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +IPUTILS_MAKE_OPTS += USE_CRYPTO=yes +IPUTILS_DEPENDENCIES += openssl +else +IPUTILS_MAKE_OPTS += USE_CRYPTO=no +endif + define IPUTILS_BUILD_CMDS $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS) endef From 73b56118f2a0d7039fda7a62380ff22d64adbfa3 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 25 Feb 2016 13:23:33 +0000 Subject: [PATCH 143/206] package/iputils: add support for nettle Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/iputils/iputils.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 953f1f552c..efedf1fe79 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -33,6 +33,13 @@ else IPUTILS_MAKE_OPTS += USE_CAP=no endif +ifeq ($(BR2_PACKAGE_NETTLE),y) +IPUTILS_MAKE_OPTS += USE_NETTLE=yes +IPUTILS_DEPENDENCIES += nettle +else +IPUTILS_MAKE_OPTS += USE_NETTLE=no +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) IPUTILS_MAKE_OPTS += USE_CRYPTO=yes IPUTILS_DEPENDENCIES += openssl From ca99ed18025d3ad42575cb23a8c284a8d64abef3 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 25 Feb 2016 13:23:34 +0000 Subject: [PATCH 144/206] package/iputils: add support for libgcrypt Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/iputils/iputils.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index efedf1fe79..92e2bc938f 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -33,6 +33,13 @@ else IPUTILS_MAKE_OPTS += USE_CAP=no endif +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +IPUTILS_MAKE_OPTS += USE_GCRYPT=yes +IPUTILS_DEPENDENCIES += libgcrypt +else +IPUTILS_MAKE_OPTS += USE_GCRYPT=no +endif + ifeq ($(BR2_PACKAGE_NETTLE),y) IPUTILS_MAKE_OPTS += USE_NETTLE=yes IPUTILS_DEPENDENCIES += nettle From 8461038f8d4db026538677cee857a3c3324fcb24 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 25 Feb 2016 13:23:35 +0000 Subject: [PATCH 145/206] package/iptuils: bump version to 3a86a2542c6fe29413c439bebeae11ec8a57ec7c Remove 0001-ping-link-against-libm.patch as this has been fixed upstream. See https://github.com/iputils/iputils/pull/42 and https://github.com/iputils/iputils/commit/a5ddb78 Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/iputils/iputils.hash | 2 +- package/iputils/iputils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash index e32e134114..1cd8ed3ed1 100644 --- a/package/iputils/iputils.hash +++ b/package/iputils/iputils.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 0e98cb527fa175d1e08afb969c124e452b30968f10ec2c3b078f1440c8977a94 iputils-c8ff6feaf0442f8efd96ccb415770c54f9e84d47.tar.gz +sha256 73de246aee1fd3cd69b1341a0c4e1b4acfa655fe6f7363fd9424824aa8bf5a57 iputils-3a86a2542c6fe29413c439bebeae11ec8a57ec7c.tar.gz diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 92e2bc938f..522be9b855 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -11,7 +11,7 @@ # and IPv6 updates. # http://www.spinics.net/lists/netdev/msg279881.html -IPUTILS_VERSION = c8ff6feaf0442f8efd96ccb415770c54f9e84d47 +IPUTILS_VERSION = 3a86a2542c6fe29413c439bebeae11ec8a57ec7c IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) IPUTILS_LICENSE = GPLv2+, BSD-3c, BSD-4c # Only includes a license file for BSD From bef15922964f6a29ac065bdaa36f11d737d21120 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 24 Feb 2016 14:38:48 -0300 Subject: [PATCH 146/206] zmqpp: bmp to version 4.1.2 Drop 0001-add-cstdlib-header-to-ensure-EXIT_FAILURE-presence.patch since it's already upstream. Rebase shared/static build patches - these look unnecessary if we switch to cmake-package, however it seems to require the zmq package switches to cmake-package as well since static library naming looks different, which might be a problem for users. Also set the minimum required version of gcc to 4.7.x since the code now requires c++1x. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- ...lding-shared-or-static-library-only.patch} | 56 ++++++++++--------- ...ader-to-ensure-EXIT_FAILURE-presence.patch | 30 ---------- ...ll-static-library-for-static-builds.patch} | 17 +++--- package/zmqpp/Config.in | 8 +-- package/zmqpp/zmqpp.hash | 3 +- package/zmqpp/zmqpp.mk | 4 +- 6 files changed, 45 insertions(+), 73 deletions(-) rename package/zmqpp/{0002-Allow-building-shared-or-static-library-only.patch => 0001-Allow-building-shared-or-static-library-only.patch} (52%) delete mode 100644 package/zmqpp/0001-add-cstdlib-header-to-ensure-EXIT_FAILURE-presence.patch rename package/zmqpp/{0003-Install-static-library-for-static-builds.patch => 0002-Install-static-library-for-static-builds.patch} (60%) diff --git a/package/zmqpp/0002-Allow-building-shared-or-static-library-only.patch b/package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch similarity index 52% rename from package/zmqpp/0002-Allow-building-shared-or-static-library-only.patch rename to package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch index 4eabf234b8..70caee8162 100644 --- a/package/zmqpp/0002-Allow-building-shared-or-static-library-only.patch +++ b/package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch @@ -1,42 +1,43 @@ -From 4c83dd96d1f92627ecdb6b6ed80b8c278aea82f7 Mon Sep 17 00:00:00 2001 +From 02ad67e60ef698ee47f6ee53b36e5b89c2fd71e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Fri, 20 Nov 2015 19:51:50 +0100 -Subject: [PATCH] Allow building shared or static library only +Date: Wed, 24 Feb 2016 10:07:11 -0300 +Subject: [PATCH 1/2] Allow building shared or static library only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +[Gustavo: update for 4.1.2] + Signed-off-by: Jörg Krause +Signed-off-by: Gustavo Zacarias --- - Makefile | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) + Makefile | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index 7d63077..90c7059 100644 +index 9df5996..86c8fac 100644 --- a/Makefile +++ b/Makefile -@@ -57,6 +57,9 @@ LIBRARY_ARCHIVE = lib$(LIBRARY_NAME).a - CLIENT_TARGET = $(LIBRARY_NAME) - TESTS_TARGET = $(LIBRARY_NAME)-tests +@@ -79,6 +79,8 @@ ifeq ($(UNAME_S),Darwin) + endif + -+BUILD_SHARED ?= yes +BUILD_SHARED ?= yes + CONFIG_FLAGS = ifeq ($(CONFIG),debug) CONFIG_FLAGS = -g -fno-inline -ftemplate-depth-1000 -@@ -71,7 +74,7 @@ ifneq (,$(findstring $(CONFIG),release loadtest)) +@@ -93,13 +95,22 @@ ifneq (,$(findstring $(CONFIG),release loadtest)) CONFIG_FLAGS = -O3 -funroll-loops -ffast-math -finline-functions -fomit-frame-pointer -DNO_DEBUG_LOG -DNO_TRACE_LOG -DNDEBUG endif --COMMON_FLAGS = -MMD -std=c++0x -pipe -Wall -fPIC \ -+COMMON_FLAGS = -MMD -std=c++0x -pipe -Wall \ +-COMMON_FLAGS = -MMD -std=c++11 -pipe -Wall -fPIC \ ++COMMON_FLAGS = -MMD -std=c++11 -pipe -Wall \ -DBUILD_ENV=$(CONFIG) \ - -DBUILD_VERSION='"$(APP_VERSION)"' \ - -DBUILD_VERSION_MAJOR=$(VERSION_MAJOR) \ -@@ -82,6 +85,15 @@ COMMON_FLAGS = -MMD -std=c++0x -pipe -Wall -fPIC \ + -DBUILD_DATESTAMP='$(APP_DATESTAMP)' \ + -DBUILD_LIBRARY_NAME='"$(LIBRARY_NAME)"' \ -DBUILD_CLIENT_NAME='"$(CLIENT_TARGET)"' \ - -I$(SRC_PATH) + -I$(SRC_PATH) $(CUSTOM_INCLUDE_PATH) +ifeq ($(BUILD_SHARED),yes) +COMMON_FLAGS += -fPIC @@ -49,20 +50,21 @@ index 7d63077..90c7059 100644 + COMMON_LIBS = -lzmq - LIBRARY_LIBS = -@@ -125,9 +137,11 @@ check: $(LIBRARY_SHARED) $(LIBRARY_ARCHIVE) test - - install: + LIBRARY_LIBS = +@@ -147,10 +158,11 @@ install: + mkdir -p $(INCLUDEDIR)/$(LIBRARY_DIR) + mkdir -p $(LIBDIR) install -m 644 $(ALL_LIBRARY_INCLUDES) $(INCLUDEDIR)/$(LIBRARY_DIR) +ifeq ($(BUILD_SHARED),yes) - install -m 755 $(BUILD_PATH)/$(LIBRARY_SHARED).$(VERSION_MAJOR) $(LIBDIR)/$(LIBRARY_SHARED).$(APP_VERSION) - ln -sf $(LIBRARY_SHARED).$(APP_VERSION) $(LIBDIR)/$(LIBRARY_SHARED).$(VERSION_MAJOR) - ln -sf $(LIBRARY_SHARED).$(APP_VERSION) $(LIBDIR)/$(LIBRARY_SHARED) + install -m 755 $(BUILD_PATH)/$(LIBRARY_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_FULL_VERSION_SHARED) +- install -m 755 $(BUILD_PATH)/$(LIBRARY_ARCHIVE) $(LIBDIR)/$(LIBRARY_ARCHIVE) + ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_VERSION_SHARED) + ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_SHARED) +endif if [ -f $(BUILD_PATH)/$(CLIENT_TARGET) ]; then install -m 755 $(BUILD_PATH)/$(CLIENT_TARGET) $(BINDIR); fi $(LDCONFIG) @echo "use make installcheck to test the install" -@@ -148,7 +162,7 @@ clean: +@@ -172,7 +184,7 @@ clean: client: $(CLIENT_TARGET) @@ -71,11 +73,11 @@ index 7d63077..90c7059 100644 # # BUILD Targets -@@ -187,4 +201,3 @@ test: $(TESTS_TARGET) +@@ -211,4 +223,3 @@ test: $(TESTS_TARGET) $(OBJECT_PATH)/%.o: $(SRC_PATH)/%.cpp -mkdir -p $(dir $@) $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(COMMON_FLAGS) $(CONFIG_FLAGS) -c -o $@ $< - -- -2.6.2 +2.4.10 diff --git a/package/zmqpp/0001-add-cstdlib-header-to-ensure-EXIT_FAILURE-presence.patch b/package/zmqpp/0001-add-cstdlib-header-to-ensure-EXIT_FAILURE-presence.patch deleted file mode 100644 index 1458eca60e..0000000000 --- a/package/zmqpp/0001-add-cstdlib-header-to-ensure-EXIT_FAILURE-presence.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2c9271fa662b98e2a451b859f2506edf5f91c9bf Mon Sep 17 00:00:00 2001 -From: Lionel Orry -Date: Fri, 15 May 2015 11:27:57 +0200 -Subject: [PATCH] add cstdlib header to ensure EXIT_FAILURE presence - -Using some cross-compiling toolchains, EXIT_FAILURE is not always -properly defined without this inclusion. - -Add myself to AUTHORS. - -Signed-off-by: Lionel Orry ---- - src/client/main.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/client/main.cpp b/src/client/main.cpp -index 082c06b..760f01a 100644 ---- a/src/client/main.cpp -+++ b/src/client/main.cpp -@@ -3,6 +3,7 @@ - * Author: @benjamg - */ - -+#include - #include - #include - #include --- -2.1.0 - diff --git a/package/zmqpp/0003-Install-static-library-for-static-builds.patch b/package/zmqpp/0002-Install-static-library-for-static-builds.patch similarity index 60% rename from package/zmqpp/0003-Install-static-library-for-static-builds.patch rename to package/zmqpp/0002-Install-static-library-for-static-builds.patch index c4ce2d219f..402f85e263 100644 --- a/package/zmqpp/0003-Install-static-library-for-static-builds.patch +++ b/package/zmqpp/0002-Install-static-library-for-static-builds.patch @@ -1,23 +1,26 @@ -From 1637443262cc861a161fd7c734bc0610a340335b Mon Sep 17 00:00:00 2001 +From 283676e2e8f15bedca20c3d94caeecfdebe11ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Mon, 23 Nov 2015 22:53:09 +0100 -Subject: [PATCH] Install static library for static builds +Subject: [PATCH 2/2] Install static library for static builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +[Gustavo: update for 4.1.2] + Signed-off-by: Jörg Krause +Signed-off-by: Gustavo Zacarias --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile -index 90c7059..abed6fa 100644 +index 86c8fac..fbaff63 100644 --- a/Makefile +++ b/Makefile -@@ -142,6 +142,9 @@ ifeq ($(BUILD_SHARED),yes) - ln -sf $(LIBRARY_SHARED).$(APP_VERSION) $(LIBDIR)/$(LIBRARY_SHARED).$(VERSION_MAJOR) - ln -sf $(LIBRARY_SHARED).$(APP_VERSION) $(LIBDIR)/$(LIBRARY_SHARED) +@@ -163,6 +163,9 @@ ifeq ($(BUILD_SHARED),yes) + ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_VERSION_SHARED) + ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_SHARED) endif +ifeq ($(BUILD_STATIC),yes) + install -m 755 $(BUILD_PATH)/$(LIBRARY_ARCHIVE) $(LIBDIR)/$(LIBRARY_ARCHIVE) @@ -26,5 +29,5 @@ index 90c7059..abed6fa 100644 $(LDCONFIG) @echo "use make installcheck to test the install" -- -2.6.2 +2.4.10 diff --git a/package/zmqpp/Config.in b/package/zmqpp/Config.in index 03792240d7..602425fc88 100644 --- a/package/zmqpp/Config.in +++ b/package/zmqpp/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ZMQPP bool "zmqpp" - # c++0x support - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 + # c++1x support + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq @@ -14,9 +14,9 @@ config BR2_PACKAGE_ZMQPP http://github.com/benjamg/zmqpp -comment "zmqpp needs a toolchain w/ C++, wchar, threads, gcc >= 4.6" +comment "zmqpp needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 if BR2_PACKAGE_ZMQPP diff --git a/package/zmqpp/zmqpp.hash b/package/zmqpp/zmqpp.hash index 7bca39fa41..63c6a34f0c 100644 --- a/package/zmqpp/zmqpp.hash +++ b/package/zmqpp/zmqpp.hash @@ -1,3 +1,2 @@ # Locally calculated -sha256 92cb5bf7e1df8b99792fe1eb530bf91fced9c2d14159007bec011bb1b8248269 zmqpp-3.2.0.tar.gz -sha256 0b76169a48a0ba9dd581b63787b4852f3922de0c22b7a325cab688c1bafb3dd7 260a9304f6c74272bd3c396f6cca685657b4aff1.patch +sha256 831ad02df64034268d910c30f9fb1b1e631ad810182951af9d7d622650831eb5 zmqpp-4.1.2.tar.gz diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk index 0bb6bbedca..18da709691 100644 --- a/package/zmqpp/zmqpp.mk +++ b/package/zmqpp/zmqpp.mk @@ -4,14 +4,12 @@ # ################################################################################ -ZMQPP_VERSION = 3.2.0 +ZMQPP_VERSION = 4.1.2 ZMQPP_SITE = $(call github,zeromq,zmqpp,$(ZMQPP_VERSION)) ZMQPP_INSTALL_STAGING = YES ZMQPP_DEPENDENCIES = zeromq ZMQPP_LICENSE = MIT ZMQPP_LICENSE_FILES = LICENSE -ZMQPP_PATCH = https://github.com/zeromq/zmqpp/commit/260a9304f6c74272bd3c396f6cca685657b4aff1.patch - ZMQPP_MAKE_OPTS = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread From 2d3621224278bef25cad56ebbe51bc0d18d0d572 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 22 Feb 2016 14:25:11 -0300 Subject: [PATCH 147/206] acl: cleanup pointless indentation Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/acl/acl.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/acl/acl.mk b/package/acl/acl.mk index 62e5d15134..cbe5e93961 100644 --- a/package/acl/acl.mk +++ b/package/acl/acl.mk @@ -16,15 +16,15 @@ ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL # While the configuration system uses autoconf, the Makefiles are # hand-written and do not use automake. Therefore, we have to hack # around their deficiencies by passing installation paths. -ACL_INSTALL_STAGING_OPTS = \ - prefix=$(STAGING_DIR)/usr \ - exec_prefix=$(STAGING_DIR)/usr \ - PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \ +ACL_INSTALL_STAGING_OPTS = \ + prefix=$(STAGING_DIR)/usr \ + exec_prefix=$(STAGING_DIR)/usr \ + PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \ install-dev install-lib -ACL_INSTALL_TARGET_OPTS = \ - prefix=$(TARGET_DIR)/usr \ - exec_prefix=$(TARGET_DIR)/usr \ +ACL_INSTALL_TARGET_OPTS = \ + prefix=$(TARGET_DIR)/usr \ + exec_prefix=$(TARGET_DIR)/usr \ install install-lib # The libdir variable in libacl.la is empty, so let's fix it. This is From 0bc739517e7b4f48e25354fc7c769a11c6d30e2a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 24 Feb 2016 11:26:29 -0300 Subject: [PATCH 148/206] attr: add host variant This is required for host-libcap for extended attributes support, which leads to capabilities support as well. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/attr/attr.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/attr/attr.mk b/package/attr/attr.mk index a66891b857..e9963bac8e 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -26,6 +26,11 @@ ATTR_INSTALL_TARGET_OPTS = \ exec_prefix=$(TARGET_DIR)/usr \ install install-lib +HOST_ATTR_INSTALL_OPTS = \ + prefix=$(HOST_DIR)/usr \ + exec_prefix=$(HOST_DIR)/usr \ + install-dev install-lib + # The libdir variable in libattr.la is empty, so let's fix it. This is # probably due to attr not using automake, and not doing fully the # right thing with libtool. @@ -37,3 +42,4 @@ endef ATTR_POST_INSTALL_STAGING_HOOKS += ATTR_FIX_LIBTOOL_LA_LIBDIR $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From a14a68057644555ddefb4ae8e9923397377daf5d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 24 Feb 2016 11:26:30 -0300 Subject: [PATCH 149/206] attr: cleanup pointless indentation Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/attr/attr.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/attr/attr.mk b/package/attr/attr.mk index e9963bac8e..3db66cb840 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -15,15 +15,15 @@ ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL # While the configuration system uses autoconf, the Makefiles are # hand-written and do not use automake. Therefore, we have to hack # around their deficiencies by passing installation paths. -ATTR_INSTALL_STAGING_OPTS = \ - prefix=$(STAGING_DIR)/usr \ - exec_prefix=$(STAGING_DIR)/usr \ - PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \ +ATTR_INSTALL_STAGING_OPTS = \ + prefix=$(STAGING_DIR)/usr \ + exec_prefix=$(STAGING_DIR)/usr \ + PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \ install-dev install-lib -ATTR_INSTALL_TARGET_OPTS = \ - prefix=$(TARGET_DIR)/usr \ - exec_prefix=$(TARGET_DIR)/usr \ +ATTR_INSTALL_TARGET_OPTS = \ + prefix=$(TARGET_DIR)/usr \ + exec_prefix=$(TARGET_DIR)/usr \ install install-lib HOST_ATTR_INSTALL_OPTS = \ From 0cc9dd31e1d07a30001645b4f8a0f4aff91dbc1c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 24 Feb 2016 11:26:31 -0300 Subject: [PATCH 150/206] libcap: enable extended attribute support This is required for capability support in files, via fakeroot. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libcap/libcap.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 54844f8d5f..252c4bbcec 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -20,8 +20,7 @@ else LIBCAP_HAVE_LIBATTR = no endif -# we don't have host-attr -HOST_LIBCAP_DEPENDENCIES = +HOST_LIBCAP_DEPENDENCIES = host-attr ifeq ($(BR2_STATIC_LIBS),y) LIBCAP_MAKE_TARGET = libcap.a @@ -67,12 +66,13 @@ define LIBCAP_INSTALL_TARGET_CMDS endef define HOST_LIBCAP_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)\ + LIBATTR=yes RAISE_SETFCAP=no endef define HOST_LIBCAP_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(HOST_DIR) \ - prefix=/usr lib=lib install + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) \ + LIBATTR=yes RAISE_SETFCAP=no prefix=/usr lib=lib install endef $(eval $(generic-package)) From 38bac6c3f87f2b8e70a1735d19fa9dac3b3d6364 Mon Sep 17 00:00:00 2001 From: Alan Ott Date: Mon, 22 Feb 2016 09:23:24 -0300 Subject: [PATCH 151/206] dsp-tools: Move download link away from Google Code Google Code is being shut down. The google code site which hosts the source .tar.gz references github/felipec, which has a dsp-tools repository with the same code as the tar.gz previously referenced. Change the DSP_TOOLS_SITE to this github repo. Signed-off-by: Alan Ott Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/dsp-tools/dsp-tools.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dsp-tools/dsp-tools.mk b/package/dsp-tools/dsp-tools.mk index 64490b829a..c91ed20629 100644 --- a/package/dsp-tools/dsp-tools.mk +++ b/package/dsp-tools/dsp-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -DSP_TOOLS_VERSION = 2.0 -DSP_TOOLS_SITE = http://gst-dsp.googlecode.com/files +DSP_TOOLS_VERSION = v2.0 +DSP_TOOLS_SITE = $(call github,felipec,dsp-tools,$(DSP_TOOLS_VERSION)) DSP_TOOLS_DEPENDENCIES = tidsp-binaries DSP_TOOLS_LICENSE = LGPLv2.1 DSP_TOOLS_LICENSE_FILES = LICENSE From ac5a2f5e36ba487d184bef8a12d754121023a26a Mon Sep 17 00:00:00 2001 From: Alan Ott Date: Mon, 22 Feb 2016 09:23:25 -0300 Subject: [PATCH 152/206] gst-dsp: Move download link away from Google Code Google Code is being shut down. The google code site which hosts the source .tar.gz references github/felipec, which has a gst-dsp repository with the same code as the tar.gz previously referenced. Change the GST_DSP_SITE to this github repo. Signed-off-by: Alan Ott Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/gstreamer/gst-dsp/gst-dsp.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer/gst-dsp/gst-dsp.mk b/package/gstreamer/gst-dsp/gst-dsp.mk index d9e202d269..dedffb9822 100644 --- a/package/gstreamer/gst-dsp/gst-dsp.mk +++ b/package/gstreamer/gst-dsp/gst-dsp.mk @@ -4,8 +4,8 @@ # ################################################################################ -GST_DSP_VERSION = 0.10.2 -GST_DSP_SITE = http://gst-dsp.googlecode.com/files +GST_DSP_VERSION = v0.10.2 +GST_DSP_SITE = $(call github,felipec,gst-dsp,$(GST_DSP_VERSION)) define GST_DSP_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e From c71d31a84ca74e6a1707d744456dbeefb6018b71 Mon Sep 17 00:00:00 2001 From: Alan Ott Date: Mon, 22 Feb 2016 09:23:26 -0300 Subject: [PATCH 153/206] gst-omapfb: Move download link away from Google Code Google Code is being shut down. The google code site which hosts the source .tar.gz references github/felipec, which has a gst-omapfb repository with the same code as the tar.gz previously referenced. Change the GST_OMAPFB_SITE to this github repo. Signed-off-by: Alan Ott Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/gstreamer/gst-omapfb/gst-omapfb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer/gst-omapfb/gst-omapfb.mk b/package/gstreamer/gst-omapfb/gst-omapfb.mk index bd545f9554..c0bf690531 100644 --- a/package/gstreamer/gst-omapfb/gst-omapfb.mk +++ b/package/gstreamer/gst-omapfb/gst-omapfb.mk @@ -4,8 +4,8 @@ # ################################################################################ -GST_OMAPFB_VERSION = 1.0 -GST_OMAPFB_SITE = http://gst-dsp.googlecode.com/files +GST_OMAPFB_VERSION = v1.0 +GST_OMAPFB_SITE = $(call github,felipec,gst-omapfb,$(GST_OMAPFB_VERSION)) define GST_OMAPFB_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e From 938946a4763846c00765a48973c685a0c04baad0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 27 Jan 2016 08:40:38 -0300 Subject: [PATCH 154/206] dt: new package Signed-off-by: Gustavo Zacarias [Thomas: use _STRIP_COMPONENTS = 2, which allows to get rid of the _SUBDIR usage, and make things a bit simpler.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/dt/0001-adjust-os-symlink.patch | 19 ++++++++++++ package/dt/Config.in | 21 +++++++++++++ package/dt/dt.hash | 5 ++++ package/dt/dt.mk | 39 +++++++++++++++++++++++++ 5 files changed, 85 insertions(+) create mode 100644 package/dt/0001-adjust-os-symlink.patch create mode 100644 package/dt/Config.in create mode 100644 package/dt/dt.hash create mode 100644 package/dt/dt.mk diff --git a/package/Config.in b/package/Config.in index 2b181479b8..67a25148e7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -73,6 +73,7 @@ menu "Debugging, profiling and benchmark" source "package/dmalloc/Config.in" source "package/dropwatch/Config.in" source "package/dstat/Config.in" + source "package/dt/Config.in" source "package/duma/Config.in" source "package/fio/Config.in" source "package/gdb/Config.in" diff --git a/package/dt/0001-adjust-os-symlink.patch b/package/dt/0001-adjust-os-symlink.patch new file mode 100644 index 0000000000..1af9d64d67 --- /dev/null +++ b/package/dt/0001-adjust-os-symlink.patch @@ -0,0 +1,19 @@ +Don't force build-dir-in-build-dir logic, symlink the os-specific SCSI +support file in place. + +Status: not suitable for upstream. + +Signed-off-by: Gustavo Zacarias + +diff -Nura Makefile.linux Makefile.linux +--- a/Makefile.linux 2016-01-26 09:10:03.939963780 -0300 ++++ b/Makefile.linux 2016-01-26 09:10:27.140763863 -0300 +@@ -129,7 +129,7 @@ + echo "Please specify OS={aix,linux,hpux,solaris,windows}"; \ + exit 1; \ + fi; \ +- ln -sf ../scsilib-$(OS).c scsilib.c ++ ln -sf scsilib-$(OS).c scsilib.c + + print:; + @$(PRINTER) $(PRINTFLAGS) $(ALL_CFILES) diff --git a/package/dt/Config.in b/package/dt/Config.in new file mode 100644 index 0000000000..848e251b60 --- /dev/null +++ b/package/dt/Config.in @@ -0,0 +1,21 @@ +comment "dt needs a (e)glibc or uclibc toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL + +config BR2_PACKAGE_DT + bool "dt" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS + # Build fails because of several BSDisms + depends on !BR2_TOOLCHAIN_USES_MUSL + help + dt is a generic data test program used to verify proper + operation of peripherals, file systems, device drivers, + or any data stream supported by the operating system. + In its' simplest mode of operation, dt writes and then + verifys its' default data pattern, then displays + performance statisics and other test parameters + before exiting. Since verification of data is performed, + dt can be thought of as a generic diagnostic tool. + + http://www.scsifaq.org/RMiller_Tools/dt.html diff --git a/package/dt/dt.hash b/package/dt/dt.hash new file mode 100644 index 0000000000..7cd8c643e1 --- /dev/null +++ b/package/dt/dt.hash @@ -0,0 +1,5 @@ +# From http://pkgs.fedoraproject.org/repo/pkgs/dt/dt-source-v18.32.tar.gz +# (directory name is md5 hash) +md5 3054aeaaba047a1dbe90c2132a382ee2 dt-source-v18.32.tar.gz +# Calculated based on the hash above +sha256 10d164676e918a4d07f233bcd11e4cb6bfd1052c996182cd1827ccd0c063fcc6 dt-source-v18.32.tar.gz diff --git a/package/dt/dt.mk b/package/dt/dt.mk new file mode 100644 index 0000000000..8ec7788883 --- /dev/null +++ b/package/dt/dt.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# dt +# +################################################################################ + +DT_VERSION = v18.32 +DT_SITE = http://pkgs.fedoraproject.org/repo/pkgs/dt/$(DT_SOURCE)/3054aeaaba047a1dbe90c2132a382ee2 +DT_SOURCE = dt-source-$(DT_VERSION).tar.gz +DT_STRIP_COMPONENTS = 2 +DT_LICENSE = ISC-like +DT_LICENSE_FILES = LICENSE + +DT_CFLAGS = \ + -std=c99 \ + -DMMAP \ + -D__linux__ \ + -D_GNU_SOURCE \ + -D_FILE_OFFSET_BITS=64 \ + -DTHREADS \ + -DSCSI + +# uClibc doesn't provide POSIX AIO +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),) +DT_CFLAGS += -DAIO +endif + +define DT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -f Makefile.linux \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) $(DT_CFLAGS)" \ + OS=linux +endef + +define DT_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/dt $(TARGET_DIR)/usr/bin/dt +endef + +$(eval $(generic-package)) From bbababe0cf8daaaf798644c3d27c4d37b4e694c2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 21 Feb 2016 19:14:12 +0100 Subject: [PATCH 155/206] package/util-linux: remove patch for uClibc support This patch is not needed anymore since the uClibc support has been removed from Buildroot. This patch was needed for uClibc <= 0.9.33 support. The only remaining supported external toolchain using uClibc 0.9.33 is the 2014R1 bfin toolchain. But all features that needs mkostemp() require fork() [1]. So, we can safely remove the patch. [1] http://lists.busybox.net/pipermail/buildroot/2016-February/153414.html Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- ...mkostemp-for-older-version-of-uClibc.patch | 50 ------------------- 1 file changed, 50 deletions(-) delete mode 100644 package/util-linux/0003-c.h-define-mkostemp-for-older-version-of-uClibc.patch diff --git a/package/util-linux/0003-c.h-define-mkostemp-for-older-version-of-uClibc.patch b/package/util-linux/0003-c.h-define-mkostemp-for-older-version-of-uClibc.patch deleted file mode 100644 index 0dfe7befba..0000000000 --- a/package/util-linux/0003-c.h-define-mkostemp-for-older-version-of-uClibc.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 42a84250fc78bae3e885ecd1379e713663fe6487 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 6 Apr 2014 12:12:41 +0200 -Subject: [PATCH 1/1] c.h: define mkostemp for older version of uClibc - -Signed-off-by: Romain Naour ---- - configure.ac | 2 ++ - include/c.h | 14 ++++++++++++++ - 2 files changed, 16 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 35a1f26..a9b8d34 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -321,6 +321,8 @@ AC_CHECK_FUNCS([ \ - ]) - AC_FUNC_FSEEKO - -+AC_CHECK_FUNCS([mkostemp]) -+ - AC_CHECK_FUNCS([openat fstatat unlinkat], [have_openat=yes], [have_openat=no]) - AC_CHECK_FUNCS([ioperm iopl], [have_io=yes]) - -diff --git a/include/c.h b/include/c.h -index 4a9bf3d..1b880ed 100644 ---- a/include/c.h -+++ b/include/c.h -@@ -300,4 +300,18 @@ static inline int usleep(useconds_t usec) - # define SEEK_HOLE 4 - #endif - -+/* -+ * mkostemp() may be missing with older version of uClibc -+ */ -+#ifndef HAVE_MKOSTEMP -+static inline int mkostemp(char *template, int flags) -+{ -+ int fd; -+ fd = mkstemp(template); -+ if (flags & O_CLOEXEC && fd >= 0) -+ fcntl(fd, F_SETFD, FD_CLOEXEC); -+ return fd; -+} -+#endif -+ - #endif /* UTIL_LINUX_C_H */ --- -1.9.0 - From 000b972f49bcf9ed35417bb787a4440f22b12f8e Mon Sep 17 00:00:00 2001 From: Sergio Prado Date: Tue, 9 Feb 2016 16:14:52 -0200 Subject: [PATCH 156/206] configs: pandaboard: bump u-boot to 2015.10 and kernel to 4.3 VFPv3 and NEON was enabled and a readme.txt file was added. Fixes bug #7580. Tested on Pandaboard ES. [Peter: use EABIhf] Signed-off-by: Sergio Prado Signed-off-by: Peter Korsgaard --- board/pandaboard/readme.txt | 76 ++++++++++++++++++++++++++++++++++++ configs/pandaboard_defconfig | 41 +++++++------------ 2 files changed, 90 insertions(+), 27 deletions(-) create mode 100644 board/pandaboard/readme.txt diff --git a/board/pandaboard/readme.txt b/board/pandaboard/readme.txt new file mode 100644 index 0000000000..8741349d19 --- /dev/null +++ b/board/pandaboard/readme.txt @@ -0,0 +1,76 @@ +Pandaboard +========== + +This file documents the Buildroot support for the Pandaboard, a +low-power, low-cost single-board computer development platform based +on the Texas Instruments OMAP4 system on a chip (SoC). + +Configuring and building Buildroot +---------------------------------- + +Start from the defconfig: + + $ make pandaboard_defconfig + +You can edit build options the usual way: + + $ make menuconfig + +When you are happy with the setup, run: + + $ make + +The result of the build with the default settings should be these files: + + output/images + ├── MLO + ├── omap4-panda-a4.dtb + ├── omap4-panda.dtb + ├── omap4-panda-es.dtb + ├── rootfs.ext2 + ├── u-boot.img + └── zImage + +Setting up your SD card +----------------------- + +*Important*: pay attention which partition you are modifying so you don't +accidentally erase the wrong file system, e.g your host computer or your +external storage! + +In the default setup you need to create two partitions on your SD card: +a boot partition and a rootfs partition. + +The ROM code from OMAP processors need the SD card to be formatted with +a special geometry in the partition table. To do that, you can use the +shell script below (this script was extracted from +http://elinux.org/Panda_How_to_MLO_%26_u-boot). + +#!/bin/sh +DRIVE=$1 +if [ -b "$DRIVE" ] ; then + dd if=/dev/zero of=$DRIVE bs=1024 count=1024 + SIZE=`fdisk -l $DRIVE | grep Disk | awk '{print $5}'` + echo DISK SIZE - $SIZE bytes + CYLINDERS=`echo $SIZE/255/63/512 | bc` + echo CYLINDERS - $CYLINDERS + { + echo ,9,0x0C,* + echo ,,,- + } | sfdisk -D -H 255 -S 63 -C $CYLINDERS $DRIVE + mkfs.vfat -F 32 -n "boot" ${DRIVE}1 + mke2fs -j -L "rootfs" ${DRIVE}2 +fi + +The next step is to mount the sdcard's first partition and copy MLO +and u-boot.img to it. + + $ sudo mkdir -p /mnt/sdcard + $ sudo mount /dev/sdX1 /mnt/sdcard + $ sudo cp MLO u-boot.img /mnt/sdcard + $ sudo umount /mnt/sdcard + +The last step is to copy the rootfs image to the sdcard's second +partition using 'dd': + + $ sudo dd if=rootfs.ext2 of=/dev/sdX2 bs=1M conv=fsync diff --git a/configs/pandaboard_defconfig b/configs/pandaboard_defconfig index 93ec1b0930..76b4caabda 100644 --- a/configs/pandaboard_defconfig +++ b/configs/pandaboard_defconfig @@ -1,37 +1,24 @@ -# Architecture BR2_arm=y BR2_cortex_a9=y - -# system -BR2_TARGET_GENERIC_GETTY=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y BR2_TARGET_GENERIC_GETTY_PORT="ttyO2" -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y - -# filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Linux headers same as kernel, a 3.12 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.3.3" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000" -BR2_LINUX_KERNEL_APPENDED_UIMAGE=y -BR2_LINUX_KERNEL_APPENDED_DTB=y -BR2_LINUX_KERNEL_USE_INTREE_DTS=y -# might need omap4-panda or omap4-panda-a4 instead -BR2_LINUX_KERNEL_INTREE_DTS_NAME="omap4-panda-es" - -# Bootloaders +BR2_LINUX_KERNEL_ZIMAGE=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="omap4-panda-es omap4-panda omap4-panda-a4" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="omap4_panda" BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_BOARDNAME="omap4_panda" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" -BR2_TARGET_UBOOT_LATEST_VERSION=n -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2012.07" From 55fad2b5b669160696fb3a15309ad98523b24d9b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 26 Feb 2016 00:11:55 +0100 Subject: [PATCH 157/206] configs: pandaboard: bump u-boot to 2016.01 and kernel to 4.4.3 and use ext4 Signed-off-by: Peter Korsgaard --- board/pandaboard/readme.txt | 4 ++-- configs/pandaboard_defconfig | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/board/pandaboard/readme.txt b/board/pandaboard/readme.txt index 8741349d19..e18ae5236f 100644 --- a/board/pandaboard/readme.txt +++ b/board/pandaboard/readme.txt @@ -27,7 +27,7 @@ The result of the build with the default settings should be these files: ├── omap4-panda-a4.dtb ├── omap4-panda.dtb ├── omap4-panda-es.dtb - ├── rootfs.ext2 + ├── rootfs.ext4 ├── u-boot.img └── zImage @@ -73,4 +73,4 @@ and u-boot.img to it. The last step is to copy the rootfs image to the sdcard's second partition using 'dd': - $ sudo dd if=rootfs.ext2 of=/dev/sdX2 bs=1M conv=fsync + $ sudo dd if=rootfs.ext4 of=/dev/sdX2 bs=1M conv=fsync diff --git a/configs/pandaboard_defconfig b/configs/pandaboard_defconfig index 76b4caabda..c217d3b143 100644 --- a/configs/pandaboard_defconfig +++ b/configs/pandaboard_defconfig @@ -2,22 +2,23 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_TARGET_GENERIC_GETTY_PORT="ttyO2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.3.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.3" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_ZIMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="omap4-panda-es omap4-panda omap4-panda-a4" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="omap4_panda" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y From 16fc95d5a1409432bde812edb26f0850e66023bd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 26 Feb 2016 15:55:43 +0100 Subject: [PATCH 158/206] pandabord: use genimage to generate sdcard image And drop the manual sdcard generation description from the readme. Signed-off-by: Peter Korsgaard --- board/pandaboard/genimage.cfg | 26 ++++++++++++++++++ board/pandaboard/post-image.sh | 16 ++++++++++++ board/pandaboard/readme.txt | 48 +++++++--------------------------- configs/pandaboard_defconfig | 3 +++ 4 files changed, 54 insertions(+), 39 deletions(-) create mode 100644 board/pandaboard/genimage.cfg create mode 100755 board/pandaboard/post-image.sh diff --git a/board/pandaboard/genimage.cfg b/board/pandaboard/genimage.cfg new file mode 100644 index 0000000000..f30033f023 --- /dev/null +++ b/board/pandaboard/genimage.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "MLO", + "u-boot.img" + } + } + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/pandaboard/post-image.sh b/board/pandaboard/post-image.sh new file mode 100755 index 0000000000..9cca1b1789 --- /dev/null +++ b/board/pandaboard/post-image.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/board/pandaboard/readme.txt b/board/pandaboard/readme.txt index e18ae5236f..1e4820b828 100644 --- a/board/pandaboard/readme.txt +++ b/board/pandaboard/readme.txt @@ -28,49 +28,19 @@ The result of the build with the default settings should be these files: ├── omap4-panda.dtb ├── omap4-panda-es.dtb ├── rootfs.ext4 + ├── sdcard.img ├── u-boot.img └── zImage -Setting up your SD card ------------------------ +How to write the SD card +------------------------ -*Important*: pay attention which partition you are modifying so you don't -accidentally erase the wrong file system, e.g your host computer or your -external storage! +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. -In the default setup you need to create two partitions on your SD card: -a boot partition and a rootfs partition. +Copy the bootable "sdcard.img" onto an SD card with "dd": -The ROM code from OMAP processors need the SD card to be formatted with -a special geometry in the partition table. To do that, you can use the -shell script below (this script was extracted from -http://elinux.org/Panda_How_to_MLO_%26_u-boot). + $ sudo dd if=output/images/sdcard.img of=/dev/sdX -#!/bin/sh -DRIVE=$1 -if [ -b "$DRIVE" ] ; then - dd if=/dev/zero of=$DRIVE bs=1024 count=1024 - SIZE=`fdisk -l $DRIVE | grep Disk | awk '{print $5}'` - echo DISK SIZE - $SIZE bytes - CYLINDERS=`echo $SIZE/255/63/512 | bc` - echo CYLINDERS - $CYLINDERS - { - echo ,9,0x0C,* - echo ,,,- - } | sfdisk -D -H 255 -S 63 -C $CYLINDERS $DRIVE - mkfs.vfat -F 32 -n "boot" ${DRIVE}1 - mke2fs -j -L "rootfs" ${DRIVE}2 -fi - -The next step is to mount the sdcard's first partition and copy MLO -and u-boot.img to it. - - $ sudo mkdir -p /mnt/sdcard - $ sudo mount /dev/sdX1 /mnt/sdcard - $ sudo cp MLO u-boot.img /mnt/sdcard - $ sudo umount /mnt/sdcard - -The last step is to copy the rootfs image to the sdcard's second -partition using 'dd': - - $ sudo dd if=rootfs.ext4 of=/dev/sdX2 bs=1M conv=fsync +Where /dev/sdX is the device node of your SD card (may be /dev/mmcblkX +instead depending on setup). diff --git a/configs/pandaboard_defconfig b/configs/pandaboard_defconfig index c217d3b143..7ae1a5086f 100644 --- a/configs/pandaboard_defconfig +++ b/configs/pandaboard_defconfig @@ -4,6 +4,7 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_TARGET_GENERIC_GETTY_PORT="ttyO2" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pandaboard/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.3" @@ -23,3 +24,5 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="omap4_panda" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y From 50c0e231a785ce3a123f4057e03683e0eb7491ce Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Fri, 26 Feb 2016 08:56:19 +0100 Subject: [PATCH 159/206] linux-backports: bump to version 4.4.2-1 Signed-off-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/linux-backports/linux-backports.hash | 4 ++-- package/linux-backports/linux-backports.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-backports/linux-backports.hash b/package/linux-backports/linux-backports.hash index 0d4106781d..38f39b98d5 100644 --- a/package/linux-backports/linux-backports.hash +++ b/package/linux-backports/linux-backports.hash @@ -1,2 +1,2 @@ -# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v4.1.1/sha256sums.asc -sha256 7fca160665b801796ce50def18f2fd6def1c4452290e93ec5332444fb2021bd6 backports-4.1.1-1.tar.xz +# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v4.4.2/sha256sums.asc +sha256 a979e194c2ed9fdfca092a448e626d85c5af0e4de5ad993c0967afd15af01285 backports-4.4.2-1.tar.xz diff --git a/package/linux-backports/linux-backports.mk b/package/linux-backports/linux-backports.mk index 44ac7e7be2..58cd50f2c4 100644 --- a/package/linux-backports/linux-backports.mk +++ b/package/linux-backports/linux-backports.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_BACKPORTS_VERSION_MAJOR = 4.1.1 +LINUX_BACKPORTS_VERSION_MAJOR = 4.4.2 LINUX_BACKPORTS_VERSION = $(LINUX_BACKPORTS_VERSION_MAJOR)-1 LINUX_BACKPORTS_SOURCE = backports-$(LINUX_BACKPORTS_VERSION).tar.xz LINUX_BACKPORTS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/projects/backports/stable/v$(LINUX_BACKPORTS_VERSION_MAJOR) From 781121b7de3faa16d3e9926e2bb51be27a84f630 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 26 Feb 2016 13:39:58 -0300 Subject: [PATCH 160/206] nano: bump to version 2.5.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/nano/nano.hash | 2 +- package/nano/nano.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index b7ddc505f6..eb6a9fc646 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 89bd6ac5120880d2a95431d8bad22bf92c7ccbf10b8f1716d4ea062f3faeeb41 nano-2.5.2.tar.gz +sha256 b2b060129b9feff2d4870d803a441178c96531de9aed144ec0b83bd63ccb12ee nano-2.5.3.tar.gz diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 4d77ea4a7e..be6ea24da5 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -4,7 +4,7 @@ # ################################################################################ -NANO_VERSION = 2.5.2 +NANO_VERSION = 2.5.3 NANO_SITE = $(BR2_GNU_MIRROR)/nano NANO_LICENSE = GPLv3+ NANO_LICENSE_FILES = COPYING From addc23ef6b4888a58375eaa77010047d4692e483 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 26 Feb 2016 20:40:13 +0900 Subject: [PATCH 161/206] configs/arm_foundationv8: bump to Linux 4.4.3 Bump to the latest kernel with DT path adjustment because Linux commit ca5b34100c57 ("dts, arm64: Move dts files to vendor subdirs") moved the DT file to the vendor sub-directory. This commit was tested with the latest model (FVP v8 Foundation Platform 9.5 build 41), so I updated the instruction in readme.txt corresponding to it. Signed-off-by: Masahiro Yamada Signed-off-by: Peter Korsgaard --- board/arm/foundation-v8/readme.txt | 4 ++-- configs/arm_foundationv8_defconfig | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/board/arm/foundation-v8/readme.txt b/board/arm/foundation-v8/readme.txt index 5406ed3b13..1dedf68cba 100644 --- a/board/arm/foundation-v8/readme.txt +++ b/board/arm/foundation-v8/readme.txt @@ -3,14 +3,14 @@ ARM software simulator of the AArch64 architecture. First, one has to download the AArch64 software simulator from: - https://silver.arm.com/download/download.tm?pv=2482590 + https://silver.arm.com/download/download.tm?pv=2663527 Then, use the arm_foundationv8_defconfig configuration to build your Buildroot system. Finally, boot your system with: - ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-4.1/Foundation_Platform \ + ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-4.7/Foundation_Platform \ --image output/images/linux-system.axf \ --block-device output/images/rootfs.ext2 \ --network=nat diff --git a/configs/arm_foundationv8_defconfig b/configs/arm_foundationv8_defconfig index 8968c77c05..d31f69d3ac 100644 --- a/configs/arm_foundationv8_defconfig +++ b/configs/arm_foundationv8_defconfig @@ -1,16 +1,16 @@ BR2_aarch64=y -# Linux headers same as kernel, a 3.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y +# Linux headers same as kernel, a 4.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" 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="4.4.3" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(LINUX_DIR)/arch/arm64/configs/defconfig" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="foundation-v8" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BOOT_WRAPPER_AARCH64=y -BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="foundation-v8" +BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8" BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS="root=/dev/vda consolelog=9 console=ttyAMA0 rw" From 025cb6ba54137fc792106ca05d97a544f1ab2b35 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 25 Feb 2016 21:30:49 +0100 Subject: [PATCH 162/206] util-linux: add option for lsblk This commit adds an option to the util-linux package that allows to build the lsblk utility. Signed-off-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/util-linux/Config.in | 5 +++++ package/util-linux/util-linux.mk | 1 + 2 files changed, 6 insertions(+) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index df89f990f8..ea2311511b 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -134,6 +134,11 @@ config BR2_PACKAGE_UTIL_LINUX_LOSETUP help Set up and control loop devices +config BR2_PACKAGE_UTIL_LINUX_LSBLK + bool "lsblk" + help + List block devices. + config BR2_PACKAGE_UTIL_LINUX_MESG bool "mesg" help diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index f6e5d62925..cf9505c8de 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -84,6 +84,7 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_LINE),--enable-line,--disable-line) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-last --enable-login --enable-runuser --enable-su --enable-sulogin,--disable-last --disable-login --disable-runuser --disable-su --disable-sulogin) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LSBLK),--enable-lsblk,--disable-lsblk) \ $(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \ $(if $(BR2_PACKAGE_UTIL_LINUX_MINIX),--enable-minix,--disable-minix) \ $(if $(BR2_PACKAGE_UTIL_LINUX_MORE),--enable-more,--disable-more) \ From dcde7c3f0398a7c759b55705fb490b40a0435aaf Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Fri, 26 Feb 2016 08:41:47 -0300 Subject: [PATCH 163/206] dsp-tools: add hash file Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/dsp-tools/dsp-tools.hash | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package/dsp-tools/dsp-tools.hash diff --git a/package/dsp-tools/dsp-tools.hash b/package/dsp-tools/dsp-tools.hash new file mode 100644 index 0000000000..cfcf06c8d6 --- /dev/null +++ b/package/dsp-tools/dsp-tools.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 734a1d5f21fb388bdbe64f7b599fef52357c3c72ff860f38456a352e7c1c3e78 dsp-tools-v2.0.tar.gz From fabf99f316ba05caa27af90c0d5fb8d26e75b994 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Fri, 26 Feb 2016 08:42:05 -0300 Subject: [PATCH 164/206] gstreamer: add missing plugin hash files Hash files for - gst-dsp - gst-omapfb - gst-plugin-x170 Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/gstreamer/gst-dsp/gst-dsp.hash | 2 ++ package/gstreamer/gst-omapfb/gst-omapfb.hash | 2 ++ package/gstreamer/gst-plugin-x170/gst-plugin-x170.hash | 2 ++ 3 files changed, 6 insertions(+) create mode 100644 package/gstreamer/gst-dsp/gst-dsp.hash create mode 100644 package/gstreamer/gst-omapfb/gst-omapfb.hash create mode 100644 package/gstreamer/gst-plugin-x170/gst-plugin-x170.hash diff --git a/package/gstreamer/gst-dsp/gst-dsp.hash b/package/gstreamer/gst-dsp/gst-dsp.hash new file mode 100644 index 0000000000..3bccfc1c3a --- /dev/null +++ b/package/gstreamer/gst-dsp/gst-dsp.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 45437a038979916de74e78a2cc7a0b01ba3982d0848e1e483a054c9cf0ce5883 gst-dsp-v0.10.2.tar.gz diff --git a/package/gstreamer/gst-omapfb/gst-omapfb.hash b/package/gstreamer/gst-omapfb/gst-omapfb.hash new file mode 100644 index 0000000000..7d1c722de9 --- /dev/null +++ b/package/gstreamer/gst-omapfb/gst-omapfb.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 56c719584d7a7ede5fc2053e8d1060f623b226a60672de0faba46fad646658a4 gst-omapfb-v1.0.tar.gz diff --git a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.hash b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.hash new file mode 100644 index 0000000000..527c461656 --- /dev/null +++ b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 734ded3618246d946b53c2c8c7ab5a0961287485aaef5fb9bf874f93e3caa342 gst-plugin-x170-1.0.tar.gz From d7e8994ec380b9aabd74e5c0881158ee47945eee Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sat, 27 Feb 2016 21:01:11 -0300 Subject: [PATCH 165/206] screen: bump to version 4.3.1 Patch files 0001 to 0005 were rebased. Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- .../screen/0001-compiler-sanity-checks.patch | 16 +++++---- package/screen/0002-no-memcpy-fallback.patch | 18 +++++----- .../0003-cross-compilation-AC_TRY_RUN.patch | 34 ++++++++++--------- ...004-cross-compilation-ignore-host-fs.patch | 30 ++++++++-------- .../0005-avoid-identifying-as-SVR4.patch | 14 ++++---- package/screen/screen.hash | 2 +- package/screen/screen.mk | 2 +- 7 files changed, 63 insertions(+), 53 deletions(-) diff --git a/package/screen/0001-compiler-sanity-checks.patch b/package/screen/0001-compiler-sanity-checks.patch index 19d13c6fab..fe6c3fdbc1 100644 --- a/package/screen/0001-compiler-sanity-checks.patch +++ b/package/screen/0001-compiler-sanity-checks.patch @@ -6,15 +6,17 @@ AC_PROG_CC already performs sanity checks. And unlike the removed checks, it does so in a way that supports cross compilation. Signed-off-by: Maarten ter Huurne +[Ricardo: rebase on top of 4.3.1] +Signed-off-by: Ricardo Martincoski --- - configure.in | 27 --------------------------- + configure.ac | 27 --------------------------- 1 file changed, 27 deletions(-) -diff --git a/configure.in b/configure.in -index 87fd43b..572c2a3 100644 ---- a/configure.in -+++ b/configure.in -@@ -47,31 +47,6 @@ AC_PROG_GCC_TRADITIONAL +diff --git a/configure.ac b/configure.ac +index ffe2e37..27690a6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -48,31 +48,6 @@ AC_PROG_GCC_TRADITIONAL AC_ISC_POSIX AC_USE_SYSTEM_EXTENSIONS @@ -46,7 +48,7 @@ index 87fd43b..572c2a3 100644 AC_PROG_AWK AC_PROG_INSTALL -@@ -1299,8 +1274,6 @@ fi +@@ -1300,8 +1275,6 @@ fi dnl Ptx bug workaround -- insert -lc after -ltermcap test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq" diff --git a/package/screen/0002-no-memcpy-fallback.patch b/package/screen/0002-no-memcpy-fallback.patch index 0f5a099f0f..f3a6a70d2a 100644 --- a/package/screen/0002-no-memcpy-fallback.patch +++ b/package/screen/0002-no-memcpy-fallback.patch @@ -12,9 +12,11 @@ for the case that bcopy and memmove are unusable, removing the memcpy option should not break any systems. Signed-off-by: Maarten ter Huurne +[Ricardo: rebase on top of 4.3.1] +Signed-off-by: Ricardo Martincoski --- acconfig.h | 3 +-- - configure.in | 18 +----------------- + configure.ac | 18 +----------------- os.h | 8 ++------ osdef.h.in | 10 +--------- 4 files changed, 5 insertions(+), 34 deletions(-) @@ -40,11 +42,11 @@ index 2e46985..9b0b9d4 100644 #undef USEMEMMOVE /* -diff --git a/configure.in b/configure.in -index 572c2a3..ff9606d 100644 ---- a/configure.in -+++ b/configure.in -@@ -1144,7 +1144,7 @@ AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT)) +diff --git a/configure.ac b/configure.ac +index 27690a6..b8e3bec 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1145,7 +1145,7 @@ AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT)) AC_CHECKING(fdwalk) AC_TRY_LINK([#include ], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK)) @@ -53,7 +55,7 @@ index 572c2a3..ff9606d 100644 AC_TRY_RUN([ main() { char buf[10]; -@@ -1174,22 +1174,6 @@ main() { +@@ -1175,22 +1175,6 @@ main() { exit(0); /* libc version works properly. */ }], AC_DEFINE(USEMEMMOVE)) @@ -77,7 +79,7 @@ index 572c2a3..ff9606d 100644 AC_MSG_CHECKING(for vsprintf) diff --git a/os.h b/os.h -index 55de249..6838ec0 100644 +index e827ac9..0b41fb9 100644 --- a/os.h +++ b/os.h @@ -142,12 +142,8 @@ extern int errno; diff --git a/package/screen/0003-cross-compilation-AC_TRY_RUN.patch b/package/screen/0003-cross-compilation-AC_TRY_RUN.patch index b908301486..eafe3d5ad1 100644 --- a/package/screen/0003-cross-compilation-AC_TRY_RUN.patch +++ b/package/screen/0003-cross-compilation-AC_TRY_RUN.patch @@ -3,15 +3,17 @@ Date: Sat, 13 Sep 2014 12:04:41 +0200 Subject: Provide cross compilation alternatives for all AC_TRY_RUN uses Signed-off-by: Maarten ter Huurne +[Ricardo: rebase on top of 4.3.1] +Signed-off-by: Ricardo Martincoski --- - configure.in | 30 +++++++++++++++++++----------- + configure.ac | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) -diff --git a/configure.in b/configure.in -index ff9606d..d53a079 100644 ---- a/configure.in -+++ b/configure.in -@@ -347,7 +347,8 @@ main() +diff --git a/configure.ac b/configure.ac +index b8e3bec..c4b7cd4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -348,7 +348,8 @@ main() exit(0); } ], AC_NOTE(- your fifos are usable) fifo=1, @@ -21,7 +23,7 @@ index ff9606d..d53a079 100644 rm -f /tmp/conftest* if test -n "$fifo"; then -@@ -395,7 +396,8 @@ main() +@@ -396,7 +397,8 @@ main() exit(0); } ], AC_NOTE(- your implementation is ok), @@ -31,7 +33,7 @@ index ff9606d..d53a079 100644 rm -f /tmp/conftest* fi -@@ -457,7 +459,8 @@ main() +@@ -458,7 +460,8 @@ main() exit(0); } ], AC_NOTE(- your sockets are usable) sock=1, @@ -41,7 +43,7 @@ index ff9606d..d53a079 100644 rm -f /tmp/conftest* if test -n "$sock"; then -@@ -496,7 +499,8 @@ main() +@@ -497,7 +500,8 @@ main() } ],AC_NOTE(- you are normal), AC_NOTE(- unix domain sockets are not kept in the filesystem) @@ -51,7 +53,7 @@ index ff9606d..d53a079 100644 rm -f /tmp/conftest* fi -@@ -623,7 +627,8 @@ main() +@@ -624,7 +628,8 @@ main() exit(0); } ],AC_NOTE(- select is ok), @@ -61,7 +63,7 @@ index ff9606d..d53a079 100644 dnl dnl **** termcap or terminfo **** -@@ -665,7 +670,8 @@ main() +@@ -666,7 +671,8 @@ main() { exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); }], AC_NOTE(- you use the termcap database), @@ -71,7 +73,7 @@ index ff9606d..d53a079 100644 AC_CHECKING(ospeed) AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED)) -@@ -800,7 +806,8 @@ main() +@@ -801,7 +807,8 @@ main() else AC_NOTE(- can't determine - assume ptys are world accessable) fi @@ -81,7 +83,7 @@ index ff9606d..d53a079 100644 ) rm -f conftest_grp fi -@@ -884,7 +891,7 @@ AC_EGREP_CPP(yes, +@@ -885,7 +892,7 @@ AC_EGREP_CPP(yes, #endif ], load=1) fi @@ -90,7 +92,7 @@ index ff9606d..d53a079 100644 AC_CHECKING(for kernelfile) for core in /unix /vmunix /dynix /hp-ux /xelos /dev/ksyms /kernel/unix /kernel/genunix /unicos /mach /netbsd /386bsd /dgux /bsd /stand/vmunix; do if test -f $core || test -c $core; then -@@ -1077,7 +1084,7 @@ main() +@@ -1078,7 +1085,7 @@ main() #endif exit(0); } @@ -99,7 +101,7 @@ index ff9606d..d53a079 100644 fi -@@ -1157,7 +1164,7 @@ main() { +@@ -1158,7 +1165,7 @@ main() { if (strncmp(buf, "cdedef", 6)) exit(1); exit(0); /* libc version works properly. */ @@ -108,7 +110,7 @@ index ff9606d..d53a079 100644 AC_TRY_RUN([ #define bcopy(s,d,l) memmove(d,s,l) -@@ -1172,7 +1179,8 @@ main() { +@@ -1173,7 +1180,8 @@ main() { if (strncmp(buf, "cdedef", 6)) exit(1); exit(0); /* libc version works properly. */ diff --git a/package/screen/0004-cross-compilation-ignore-host-fs.patch b/package/screen/0004-cross-compilation-ignore-host-fs.patch index aeacfb1d9f..fa698ef1f7 100644 --- a/package/screen/0004-cross-compilation-ignore-host-fs.patch +++ b/package/screen/0004-cross-compilation-ignore-host-fs.patch @@ -3,15 +3,17 @@ Date: Sun, 14 Sep 2014 07:10:59 +0200 Subject: When cross-compiling, skip checks that look in the host file system Signed-off-by: Maarten ter Huurne +[Ricardo: rebase on top of 4.3.1] +Signed-off-by: Ricardo Martincoski --- - configure.in | 23 +++++++++++++++++++---- + configure.ac | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) -diff --git a/configure.in b/configure.in -index d53a079..79aa56d 100644 ---- a/configure.in -+++ b/configure.in -@@ -84,7 +84,7 @@ AC_ARG_ENABLE(socket-dir, +diff --git a/configure.ac b/configure.ac +index c4b7cd4..9cf7cee 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -85,7 +85,7 @@ AC_ARG_ENABLE(socket-dir, dnl dnl **** special unix variants **** dnl @@ -20,7 +22,7 @@ index d53a079..79aa56d 100644 AC_DEFINE(ISC) LIBS="$LIBS -linet" fi -@@ -95,10 +95,11 @@ dnl AC_DEFINE(OSF1) # this disables MIPS again.... +@@ -96,10 +96,11 @@ dnl AC_DEFINE(OSF1) # this disables MIPS again.... dnl fi dnl fi @@ -33,7 +35,7 @@ index d53a079..79aa56d 100644 AC_CHECKING(for MIPS) if test -f /lib/libmld.a || test -f /usr/lib/libmld.a || test -f /usr/lib/cmplrs/cc/libmld.a; then oldlibs="$LIBS" -@@ -122,6 +123,7 @@ AC_DEFINE(USE_WAIT2) LIBS="$LIBS -lbsd" ; CC="$CC -I/usr/include/bsd" +@@ -123,6 +124,7 @@ AC_DEFINE(USE_WAIT2) LIBS="$LIBS -lbsd" ; CC="$CC -I/usr/include/bsd" )) fi fi @@ -41,7 +43,7 @@ index d53a079..79aa56d 100644 AC_CHECKING(for Ultrix) -@@ -131,7 +133,7 @@ AC_EGREP_CPP(yes, +@@ -132,7 +134,7 @@ AC_EGREP_CPP(yes, #endif ], ULTRIX=1) @@ -50,7 +52,7 @@ index d53a079..79aa56d 100644 oldlibs="$LIBS" LIBS="$LIBS -lpyr" AC_CHECKING(Pyramid OSX) -@@ -678,17 +680,21 @@ AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED)) +@@ -679,17 +681,21 @@ AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED)) dnl dnl **** PTY specific things **** dnl @@ -72,7 +74,7 @@ index d53a079..79aa56d 100644 AC_CHECK_FUNCS(getpt) -@@ -698,6 +704,7 @@ AC_CHECK_FUNCS(openpty,, +@@ -699,6 +705,7 @@ AC_CHECK_FUNCS(openpty,, [AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY)] [LIBS="$LIBS -lutil"])]) fi @@ -80,7 +82,7 @@ index d53a079..79aa56d 100644 AC_CHECKING(for ptyranges) if test -d /dev/ptym ; then pdir='/dev/ptym' -@@ -721,6 +728,7 @@ p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\ +@@ -722,6 +729,7 @@ p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\ AC_DEFINE_UNQUOTED(PTYRANGE0,"$p0") AC_DEFINE_UNQUOTED(PTYRANGE1,"$p1") fi @@ -88,7 +90,7 @@ index d53a079..79aa56d 100644 dnl **** pty mode/group handling **** dnl -@@ -868,14 +876,16 @@ fi +@@ -869,14 +877,16 @@ fi dnl dnl **** loadav **** dnl @@ -106,7 +108,7 @@ index d53a079..79aa56d 100644 olibs="$LIBS" LIBS="$LIBS -lkvm" AC_CHECKING(getloadavg with -lkvm) -@@ -1093,13 +1103,18 @@ dnl **** libraries **** +@@ -1094,13 +1104,18 @@ dnl **** libraries **** dnl AC_CHECKING(for crypt and sec libraries) diff --git a/package/screen/0005-avoid-identifying-as-SVR4.patch b/package/screen/0005-avoid-identifying-as-SVR4.patch index 10c08d21ee..745ef41931 100644 --- a/package/screen/0005-avoid-identifying-as-SVR4.patch +++ b/package/screen/0005-avoid-identifying-as-SVR4.patch @@ -12,15 +12,17 @@ workaround was added for, so all I could do is make an educated guess at the #defines its compiler would be likely to set. Signed-off-by: Maarten ter Huurne +[Ricardo: rebase on top of 4.3.1] +Signed-off-by: Ricardo Martincoski --- - configure.in | 14 ++++++++++++-- + configure.ac | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -diff --git a/configure.in b/configure.in -index f78f81f..181b7f9 100644 ---- a/configure.in -+++ b/configure.in -@@ -178,14 +178,24 @@ AC_EGREP_CPP(yes, +diff --git a/configure.ac b/configure.ac +index 9cf7cee..e09e4cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -179,14 +179,24 @@ AC_EGREP_CPP(yes, #endif ], LIBS="$LIBS -lsocket -linet";seqptx=1) diff --git a/package/screen/screen.hash b/package/screen/screen.hash index 1b20458b12..10ba21407d 100644 --- a/package/screen/screen.hash +++ b/package/screen/screen.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080 screen-4.2.1.tar.gz +sha256 fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63 screen-4.3.1.tar.gz diff --git a/package/screen/screen.mk b/package/screen/screen.mk index 827e776fe7..45689d3d71 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -4,7 +4,7 @@ # ################################################################################ -SCREEN_VERSION = 4.2.1 +SCREEN_VERSION = 4.3.1 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPLv3+ SCREEN_LICENSE_FILES = COPYING From 8c0a367d0a2cb370e94804a500f94fe8c1ccd925 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 24 Feb 2016 17:25:50 -0300 Subject: [PATCH 166/206] gcc: remove 4.5.x It's been deprecated for some time now. Signed-off-by: Gustavo Zacarias [Thomas: move option to Config.in.legacy, as noticed by Peter.] Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 + package/gcc/4.5.4/100-uclibc-conf.patch | 13 - ...werpc-link-with-math-lib.patch.conditional | 125 ------- .../gcc/4.5.4/301-missing-execinfo_h.patch | 11 - package/gcc/4.5.4/302-c99-snprintf.patch | 13 - .../4.5.4/305-libmudflap-susv3-legacy.patch | 49 --- .../gcc/4.5.4/810-arm-softfloat-libgcc.patch | 38 -- .../gcc/4.5.4/820-arm-unbreak-armv4t.patch | 14 - package/gcc/4.5.4/830-arm-pr43440.patch | 345 ------------------ package/gcc/Config.in.host | 27 -- 10 files changed, 7 insertions(+), 635 deletions(-) delete mode 100644 package/gcc/4.5.4/100-uclibc-conf.patch delete mode 100644 package/gcc/4.5.4/1000-powerpc-link-with-math-lib.patch.conditional delete mode 100644 package/gcc/4.5.4/301-missing-execinfo_h.patch delete mode 100644 package/gcc/4.5.4/302-c99-snprintf.patch delete mode 100644 package/gcc/4.5.4/305-libmudflap-susv3-legacy.patch delete mode 100644 package/gcc/4.5.4/810-arm-softfloat-libgcc.patch delete mode 100644 package/gcc/4.5.4/820-arm-unbreak-armv4t.patch delete mode 100644 package/gcc/4.5.4/830-arm-pr43440.patch diff --git a/Config.in.legacy b/Config.in.legacy index 0ea8c7d8d1..1cd26979d7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,13 @@ endif ############################################################################### comment "Legacy options removed in 2016.02" +config BR2_GCC_VERSION_4_5_X + bool "gcc 4.5.x has been removed" + select BR2_LEGACY + help + The 4.5.x version of gcc has been removed. Use a newer + version instead. + config BR2_PACKAGE_SQLITE_READLINE bool "command-line editing support was updated" select BR2_PACKAGE_NCURSES diff --git a/package/gcc/4.5.4/100-uclibc-conf.patch b/package/gcc/4.5.4/100-uclibc-conf.patch deleted file mode 100644 index 6bad179e62..0000000000 --- a/package/gcc/4.5.4/100-uclibc-conf.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- gcc/gcc/config/--- gcc/contrib/regression/objs-gcc.sh -+++ gcc/contrib/regression/objs-gcc.sh -@@ -105,6 +105,10 @@ - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 diff --git a/package/gcc/4.5.4/1000-powerpc-link-with-math-lib.patch.conditional b/package/gcc/4.5.4/1000-powerpc-link-with-math-lib.patch.conditional deleted file mode 100644 index 7e75e87f23..0000000000 --- a/package/gcc/4.5.4/1000-powerpc-link-with-math-lib.patch.conditional +++ /dev/null @@ -1,125 +0,0 @@ -http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html - -On glibc the libc.so carries a copy of the math function copysignl() but -on uClibc math functions like copysignl() live in libm. Since libgcc_s -contains unresolved symbols, any attempt to link against libgcc_s -without explicitely specifying -lm fails, resulting in a broken -bootstrap of the compiler. - -Forward port to gcc 4.5.1 by Gustavo Zacarias - -diff -Nura gcc-4.5.1.orig/gcc/config/t-slibgcc-elf-ver gcc-4.5.1/gcc/config/t-slibgcc-elf-ver ---- gcc-4.5.1.orig/gcc/config/t-slibgcc-elf-ver 2010-11-03 14:35:08.644904042 -0300 -+++ gcc-4.5.1/gcc/config/t-slibgcc-elf-ver 2010-11-03 14:35:56.332904024 -0300 -@@ -27,7 +27,7 @@ - SHLIB_OBJS = @shlib_objs@ - SHLIB_DIR = @multilib_dir@ - SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@ --SHLIB_LC = -lc -+SHLIB_LC = @libgcc_libm@ -lc - SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK) - SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \ - $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) -diff -Nura gcc-4.5.1.orig/libgcc/Makefile.in gcc-4.5.1/libgcc/Makefile.in ---- gcc-4.5.1.orig/libgcc/Makefile.in 2010-11-03 14:32:44.272904042 -0300 -+++ gcc-4.5.1/libgcc/Makefile.in 2010-11-03 14:37:03.893904042 -0300 -@@ -39,6 +39,7 @@ - decimal_float = @decimal_float@ - enable_decimal_float = @enable_decimal_float@ - fixed_point = @fixed_point@ -+LIBGCC_LIBM = @LIBGCC_LIBM@ - - host_noncanonical = @host_noncanonical@ - -@@ -798,9 +799,10 @@ - @multilib_dir@,$(MULTIDIR),$(subst \ - @shlib_objs@,$(objects),$(subst \ - @shlib_base_name@,libgcc_s,$(subst \ -+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \ - @shlib_map_file@,$(mapfile),$(subst \ - @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \ -- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))) -+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))) - - libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts) - # @multilib_flags@ is still needed because this may use -diff -Nura gcc-4.5.1.orig/libgcc/configure gcc-4.5.1/libgcc/configure ---- gcc-4.5.1.orig/libgcc/configure 2010-11-03 14:32:44.283904042 -0300 -+++ gcc-4.5.1/libgcc/configure 2010-11-03 14:39:48.685904042 -0300 -@@ -557,6 +557,7 @@ - extra_parts - tmake_file - set_use_emutls -+LIBGCC_LIBM - set_have_cc_tls - vis_hide - fixed_point -@@ -3847,6 +3848,37 @@ - set_use_emutls="-DUSE_EMUTLS" - fi - -+# On powerpc libgcc_s references copysignl which is a libm function but -+# glibc apparently also provides it via libc as opposed to uClibc where -+# it lives in libm. -+echo "$as_me:$LINENO: checking for library containing copysignl" >&5 -+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6 -+if test "${libgcc_cv_copysignl_lib+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ echo '#include ' > conftest.c -+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c -+ libgcc_cv_copysignl_lib="-lc" -+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } -+ then -+ libgcc_cv_copysignl_lib="-lm" -+ fi -+ rm -f conftest.* -+ -+fi -+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5 -+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6 -+ -+case /${libgcc_cv_copysignl_lib}/ in -+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; -+ *) LIBGCC_LIBM= ;; -+esac - - # Conditionalize the makefile for this target machine. - tmake_file_= -diff -Nura gcc-4.5.1.orig/libgcc/configure.ac gcc-4.5.1/libgcc/configure.ac ---- gcc-4.5.1.orig/libgcc/configure.ac 2010-11-03 14:32:44.735904042 -0300 -+++ gcc-4.5.1/libgcc/configure.ac 2010-11-03 14:42:11.278904045 -0300 -@@ -238,6 +238,27 @@ - fi - AC_SUBST(set_have_cc_tls) - -+# On powerpc libgcc_s references copysignl which is a libm function but -+# glibc apparently also provides it via libc as opposed to uClibc where -+# it lives in libm. -+AC_CACHE_CHECK -+ libgcc_cv_copysignl_lib, -+ echo '#include ' > conftest.c -+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c -+ libgcc_cv_copysignl_lib="-lc" -+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD) -+ then -+ libgcc_cv_copysignl_lib="-lm" -+ fi -+ rm -f conftest.* -+ ]) -+ -+case /${libgcc_cv_copysignl_lib}/ in -+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; -+ *) LIBGCC_LIBM= ;; -+esac -+AC_SUBST(LIBGCC_LIBM) -+ - # See if we have emulated thread-local storage. - GCC_CHECK_EMUTLS - set_use_emutls= diff --git a/package/gcc/4.5.4/301-missing-execinfo_h.patch b/package/gcc/4.5.4/301-missing-execinfo_h.patch deleted file mode 100644 index 0e2092f3fb..0000000000 --- a/package/gcc/4.5.4/301-missing-execinfo_h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gcc-4.0.0/boehm-gc/include/gc.h-orig 2005-04-28 22:28:57.000000000 -0500 -+++ gcc-4.0.0/boehm-gc/include/gc.h 2005-04-28 22:30:38.000000000 -0500 -@@ -500,7 +500,7 @@ - #ifdef __linux__ - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/package/gcc/4.5.4/302-c99-snprintf.patch b/package/gcc/4.5.4/302-c99-snprintf.patch deleted file mode 100644 index ba51a0e1d4..0000000000 --- a/package/gcc/4.5.4/302-c99-snprintf.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gcc-4.3.0/libstdc++-v3/include/c_global/cstdio -=================================================================== ---- gcc-4.3.0/libstdc++-v3/include/c_global/cstdio (revision 129202) -+++ gcc-4.3.0/libstdc++-v3/include/c_global/cstdio (working copy) -@@ -144,7 +144,7 @@ - - _GLIBCXX_END_NAMESPACE - --#if _GLIBCXX_USE_C99 -+#if _GLIBCXX_USE_C99 || defined __UCLIBC__ - - #undef snprintf - #undef vfscanf diff --git a/package/gcc/4.5.4/305-libmudflap-susv3-legacy.patch b/package/gcc/4.5.4/305-libmudflap-susv3-legacy.patch deleted file mode 100644 index 374b1f8659..0000000000 --- a/package/gcc/4.5.4/305-libmudflap-susv3-legacy.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: gcc-4.2/libmudflap/mf-hooks2.c -=================================================================== ---- gcc-4.2/libmudflap/mf-hooks2.c (revision 119834) -+++ gcc-4.2/libmudflap/mf-hooks2.c (working copy) -@@ -427,7 +427,7 @@ - { - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region"); -- bzero (s, n); -+ memset (s, 0, n); - } - - -@@ -437,7 +437,7 @@ - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src"); - MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest"); -- bcopy (src, dest, n); -+ memmove (dest, src, n); - } - - -@@ -447,7 +447,7 @@ - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg"); - MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg"); -- return bcmp (s1, s2, n); -+ return n == 0 ? 0 : memcmp (s1, s2, n); - } - - -@@ -456,7 +456,7 @@ - size_t n = strlen (s); - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region"); -- return index (s, c); -+ return strchr (s, c); - } - - -@@ -465,7 +465,7 @@ - size_t n = strlen (s); - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region"); -- return rindex (s, c); -+ return strrchr (s, c); - } - - /* XXX: stpcpy, memccpy */ diff --git a/package/gcc/4.5.4/810-arm-softfloat-libgcc.patch b/package/gcc/4.5.4/810-arm-softfloat-libgcc.patch deleted file mode 100644 index e6a30a3f00..0000000000 --- a/package/gcc/4.5.4/810-arm-softfloat-libgcc.patch +++ /dev/null @@ -1,38 +0,0 @@ -[PATCH] add the correct symbols to libgcc for uclibc arm softfloat - -Signed-off-by: Peter Korsgaard ---- - gcc/config/arm/linux-elf.h | 2 +- - gcc/config/arm/t-linux | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -Index: gcc-4.4.0/gcc/config/arm/t-linux -=================================================================== ---- gcc-4.4.0.orig/gcc/config/arm/t-linux -+++ gcc-4.4.0/gcc/config/arm/t-linux -@@ -4,7 +4,11 @@ - - LIB1ASMSRC = arm/lib1funcs.asm - LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ -- _arm_addsubdf3 _arm_addsubsf3 -+ _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ -+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ -+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ -+ _arm_fixsfsi _arm_fixunssfsi - - # MULTILIB_OPTIONS = mhard-float/msoft-float - # MULTILIB_DIRNAMES = hard-float soft-float -Index: gcc-4.4.0/gcc/config/arm/linux-elf.h -=================================================================== ---- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h -+++ gcc-4.4.0/gcc/config/arm/linux-elf.h -@@ -60,7 +60,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - diff --git a/package/gcc/4.5.4/820-arm-unbreak-armv4t.patch b/package/gcc/4.5.4/820-arm-unbreak-armv4t.patch deleted file mode 100644 index 8651afcd86..0000000000 --- a/package/gcc/4.5.4/820-arm-unbreak-armv4t.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://sourceware.org/ml/crossgcc/2008-05/msg00009.html - -diff -Nura gcc-4.5.1.orig/gcc/config/arm/linux-eabi.h gcc-4.5.1/gcc/config/arm/linux-eabi.h ---- gcc-4.5.1.orig/gcc/config/arm/linux-eabi.h 2009-10-30 17:03:09.000000000 -0300 -+++ gcc-4.5.1/gcc/config/arm/linux-eabi.h 2010-11-02 15:38:25.792208500 -0300 -@@ -44,7 +44,7 @@ - The ARM10TDMI core is the default for armv5t, so set - SUBTARGET_CPU_DEFAULT to achieve this. */ - #undef SUBTARGET_CPU_DEFAULT --#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi -+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - /* TARGET_BIG_ENDIAN_DEFAULT is set in - config.gcc for big endian configurations. */ diff --git a/package/gcc/4.5.4/830-arm-pr43440.patch b/package/gcc/4.5.4/830-arm-pr43440.patch deleted file mode 100644 index 811d1f249d..0000000000 --- a/package/gcc/4.5.4/830-arm-pr43440.patch +++ /dev/null @@ -1,345 +0,0 @@ -http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43440 - ---- gcc-4.4.4.orig/gcc/config/arm/aout.h -+++ gcc-4.4.4/gcc/config/arm/aout.h -@@ -163,34 +163,49 @@ - {"mvdx12", 39}, \ - {"mvdx13", 40}, \ - {"mvdx14", 41}, \ -- {"mvdx15", 42}, \ -- {"d0", 63}, {"q0", 63}, \ -- {"d1", 65}, \ -- {"d2", 67}, {"q1", 67}, \ -- {"d3", 69}, \ -- {"d4", 71}, {"q2", 71}, \ -- {"d5", 73}, \ -- {"d6", 75}, {"q3", 75}, \ -- {"d7", 77}, \ -- {"d8", 79}, {"q4", 79}, \ -- {"d9", 81}, \ -- {"d10", 83}, {"q5", 83}, \ -- {"d11", 85}, \ -- {"d12", 87}, {"q6", 87}, \ -- {"d13", 89}, \ -- {"d14", 91}, {"q7", 91}, \ -- {"d15", 93}, \ -- {"q8", 95}, \ -- {"q9", 99}, \ -- {"q10", 103}, \ -- {"q11", 107}, \ -- {"q12", 111}, \ -- {"q13", 115}, \ -- {"q14", 119}, \ -- {"q15", 123} \ -+ {"mvdx15", 42} \ - } - #endif - -+#ifndef OVERLAPPING_REGISTER_NAMES -+#define OVERLAPPING_REGISTER_NAMES \ -+{ \ -+ {"d0", 63, 2}, \ -+ {"d1", 65, 2}, \ -+ {"d2", 67, 2}, \ -+ {"d3", 69, 2}, \ -+ {"d4", 71, 2}, \ -+ {"d5", 73, 2}, \ -+ {"d6", 75, 2}, \ -+ {"d7", 77, 2}, \ -+ {"d8", 79, 2}, \ -+ {"d9", 81, 2}, \ -+ {"d10", 83, 2}, \ -+ {"d11", 85, 2}, \ -+ {"d12", 87, 2}, \ -+ {"d13", 89, 2}, \ -+ {"d14", 91, 2}, \ -+ {"d15", 93, 2}, \ -+ {"q0", 63, 4}, \ -+ {"q1", 67, 4}, \ -+ {"q2", 71, 4}, \ -+ {"q3", 75, 4}, \ -+ {"q4", 79, 4}, \ -+ {"q5", 83, 4}, \ -+ {"q6", 87, 4}, \ -+ {"q7", 91, 4}, \ -+ {"q8", 95, 4}, \ -+ {"q9", 99, 4}, \ -+ {"q10", 103, 4}, \ -+ {"q11", 107, 4}, \ -+ {"q12", 111, 4}, \ -+ {"q13", 115, 4}, \ -+ {"q14", 119, 4}, \ -+ {"q15", 123, 4} \ -+} -+#endif -+ -+ - #ifndef NO_DOLLAR_IN_LABEL - #define NO_DOLLAR_IN_LABEL 1 - #endif ---- gcc-4.4.4.orig/gcc/output.h -+++ gcc-4.4.4/gcc/output.h -@@ -169,6 +169,11 @@ - Prefixes such as % are optional. */ - extern int decode_reg_name (const char *); - -+/* Similar to decode_reg_name, but takes an extra parameter that is a -+ pointer to the number of (internal) registers described by the -+ external name. */ -+extern int decode_reg_name_and_count (const char *, int *); -+ - extern void assemble_alias (tree, tree); - - extern void default_assemble_visibility (tree, int); ---- gcc-4.4.4.orig/gcc/reginfo.c -+++ gcc-4.4.4/gcc/reginfo.c -@@ -800,39 +800,44 @@ - fix_register (const char *name, int fixed, int call_used) - { - int i; -+ int reg, nregs; - - /* Decode the name and update the primary form of - the register info. */ -- -- if ((i = decode_reg_name (name)) >= 0) -+ if ((reg = decode_reg_name_and_count (name, &nregs)) >= 0) - { -- if ((i == STACK_POINTER_REGNUM -+ gcc_assert (nregs >= 1); -+ for (i = reg; i < reg + nregs; i++) -+ { -+ if ((i == STACK_POINTER_REGNUM - #ifdef HARD_FRAME_POINTER_REGNUM -- || i == HARD_FRAME_POINTER_REGNUM -+ || i == HARD_FRAME_POINTER_REGNUM - #else -- || i == FRAME_POINTER_REGNUM -+ || i == FRAME_POINTER_REGNUM - #endif -- ) -- && (fixed == 0 || call_used == 0)) -- { -- static const char * const what_option[2][2] = { -- { "call-saved", "call-used" }, -- { "no-such-option", "fixed" }}; -+ ) -+ && (fixed == 0 || call_used == 0)) -+ { -+ static const char * const what_option[2][2] = { -+ { "call-saved", "call-used" }, -+ { "no-such-option", "fixed" }}; - -- error ("can't use '%s' as a %s register", name, -- what_option[fixed][call_used]); -- } -- else -- { -- fixed_regs[i] = fixed; -- call_used_regs[i] = call_used; -+ error ("can't use '%s' as a %s register", name, -+ what_option[fixed][call_used]); -+ } -+ else -+ { -+ fixed_regs[i] = fixed; -+ call_used_regs[i] = call_used; - #ifdef CALL_REALLY_USED_REGISTERS -- if (fixed == 0) -- call_really_used_regs[i] = call_used; -+ if (fixed == 0) -+ call_really_used_regs[i] = call_used; - #endif -- } -- } -- else -+ } -+ } -+ } -+ else -+ - { - warning (0, "unknown register name: %s", name); - } ---- gcc-4.4.4.orig/gcc/stmt.c -+++ gcc-4.4.4/gcc/stmt.c -@@ -681,13 +681,14 @@ - for (tail = clobbers; tail; tail = TREE_CHAIN (tail)) - { - const char *regname; -+ int nregs; - - if (TREE_VALUE (tail) == error_mark_node) - return; - regname = TREE_STRING_POINTER (TREE_VALUE (tail)); - -- i = decode_reg_name (regname); -- if (i >= 0 || i == -4) -+ i = decode_reg_name_and_count (regname, &nregs); -+ if (i == -4) - ++nclobbers; - else if (i == -2) - error ("unknown register name %qs in %", regname); -@@ -695,14 +696,21 @@ - /* Mark clobbered registers. */ - if (i >= 0) - { -- /* Clobbering the PIC register is an error. */ -- if (i == (int) PIC_OFFSET_TABLE_REGNUM) -- { -- error ("PIC register %qs clobbered in %", regname); -- return; -- } -+ int reg; - -- SET_HARD_REG_BIT (clobbered_regs, i); -+ for (reg = i; reg < i + nregs; reg++) -+ { -+ ++nclobbers; -+ -+ /* Clobbering the PIC register is an error. */ -+ if (reg == (int) PIC_OFFSET_TABLE_REGNUM) -+ { -+ error ("PIC register clobbered by %qs in %", regname); -+ return; -+ } -+ -+ SET_HARD_REG_BIT (clobbered_regs, reg); -+ } - } - } - -@@ -1012,8 +1020,9 @@ - for (tail = clobbers; tail; tail = TREE_CHAIN (tail)) - { - const char *regname = TREE_STRING_POINTER (TREE_VALUE (tail)); -- int j = decode_reg_name (regname); -- rtx clobbered_reg; -+ int reg, nregs; -+ int j = decode_reg_name_and_count (regname, &nregs); -+ rtx clobbered_reg; - - if (j < 0) - { -@@ -1033,31 +1042,40 @@ - /* Ignore unknown register, error already signaled. */ - continue; - } -- -- /* Use QImode since that's guaranteed to clobber just one reg. */ -- clobbered_reg = gen_rtx_REG (QImode, j); -- -- /* Do sanity check for overlap between clobbers and respectively -- input and outputs that hasn't been handled. Such overlap -- should have been detected and reported above. */ -- if (!clobber_conflict_found) -- { -- int opno; -- -- /* We test the old body (obody) contents to avoid tripping -- over the under-construction body. */ -- for (opno = 0; opno < noutputs; opno++) -- if (reg_overlap_mentioned_p (clobbered_reg, output_rtx[opno])) -- internal_error ("asm clobber conflict with output operand"); -- -- for (opno = 0; opno < ninputs - ninout; opno++) -- if (reg_overlap_mentioned_p (clobbered_reg, -- ASM_OPERANDS_INPUT (obody, opno))) -- internal_error ("asm clobber conflict with input operand"); -+ -+ for (reg = j; reg < j + nregs; reg++) -+ { -+ /* Use QImode since that's guaranteed to clobber just -+ * one reg. */ -+ clobbered_reg = gen_rtx_REG (QImode, reg); -+ -+ /* Do sanity check for overlap between clobbers and -+ respectively input and outputs that hasn't been -+ handled. Such overlap should have been detected and -+ reported above. */ -+ if (!clobber_conflict_found) -+ { -+ int opno; -+ -+ /* We test the old body (obody) contents to avoid -+ tripping over the under-construction body. */ -+ for (opno = 0; opno < noutputs; opno++) -+ if (reg_overlap_mentioned_p (clobbered_reg, -+ output_rtx[opno])) -+ internal_error -+ ("asm clobber conflict with output operand"); -+ -+ for (opno = 0; opno < ninputs - ninout; opno++) -+ if (reg_overlap_mentioned_p (clobbered_reg, -+ ASM_OPERANDS_INPUT (obody, -+ opno))) -+ internal_error -+ ("asm clobber conflict with input operand"); -+ } -+ -+ XVECEXP (body, 0, i++) -+ = gen_rtx_CLOBBER (VOIDmode, clobbered_reg); - } -- -- XVECEXP (body, 0, i++) -- = gen_rtx_CLOBBER (VOIDmode, clobbered_reg); - } - - emit_insn (body); ---- gcc-4.4.4.orig/gcc/varasm.c -+++ gcc-4.4.4/gcc/varasm.c -@@ -1031,8 +1031,11 @@ - Prefixes such as % are optional. */ - - int --decode_reg_name (const char *asmspec) -+decode_reg_name_and_count (const char *asmspec, int *pnregs) - { -+ /* Presume just one register is clobbered. */ -+ *pnregs = 1; -+ - if (asmspec != 0) - { - int i; -@@ -1058,6 +1061,25 @@ - && ! strcmp (asmspec, strip_reg_name (reg_names[i]))) - return i; - -+#ifdef OVERLAPPING_REGISTER_NAMES -+ { -+ static const struct -+ { -+ const char *const name; -+ const int number; -+ const int nregs; -+ } table[] = OVERLAPPING_REGISTER_NAMES; -+ -+ for (i = 0; i < (int) ARRAY_SIZE (table); i++) -+ if (table[i].name[0] -+ && ! strcmp (asmspec, table[i].name)) -+ { -+ *pnregs = table[i].nregs; -+ return table[i].number; -+ } -+ } -+#endif /* OVERLAPPING_REGISTER_NAMES */ -+ - #ifdef ADDITIONAL_REGISTER_NAMES - { - static const struct { const char *const name; const int number; } table[] -@@ -1081,6 +1103,15 @@ - - return -1; - } -+ -+int -+decode_reg_name (const char *name) -+{ -+ int count; -+ return decode_reg_name_and_count (name, &count); -+} -+ -+ - - /* Return true if DECL's initializer is suitable for a BSS section. */ - diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 5cc0dd3bdd..48457086f4 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -13,32 +13,6 @@ choice help Select the version of gcc you wish to use. - config BR2_GCC_VERSION_4_5_X - bool "gcc 4.5.x" - depends on BR2_DEPRECATED_SINCE_2015_05 - # Broken or unsupported architectures - depends on !BR2_microblaze && !BR2_aarch64 && !BR2_arc \ - && !BR2_powerpc64le && !BR2_nios2 - # Broken or unsupported ARM cores - depends on !BR2_cortex_a7 && !BR2_cortex_a12 && \ - !BR2_cortex_a15 && !BR2_cortex_a17 && \ - !BR2_fa526 && !BR2_pj4 - # Broken or unsupported PPC cores - depends on !BR2_powerpc_e5500 && !BR2_powerpc_e6500 && \ - !BR2_powerpc_power8 - # SPARC -mcpu=leon3 appeared in gcc 4.8.x - depends on !BR2_sparc_leon3 - # Broken or unsupported X86 cores - depends on !BR2_x86_corei7 && !BR2_x86_jaguar && !BR2_x86_steamroller - # ARM EABIhf support appeared in gcc 4.6 - depends on !BR2_ARM_EABIHF - # Unsupported for MIPS R6 - depends on !BR2_mips_32r6 && !BR2_mips_64r6 - # musl patches only for gcc 4.7+ - depends on !BR2_TOOLCHAIN_BUILDROOT_MUSL - select BR2_GCC_NEEDS_MPC - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - config BR2_GCC_VERSION_4_7_X bool "gcc 4.7.x" depends on BR2_DEPRECATED_SINCE_2016_05 @@ -113,7 +87,6 @@ config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE config BR2_GCC_VERSION string - default "4.5.4" if BR2_GCC_VERSION_4_5_X default "4.7.4" if BR2_GCC_VERSION_4_7_X default "4.8.5" if BR2_GCC_VERSION_4_8_X default "4.9.3" if BR2_GCC_VERSION_4_9_X From 8e738967d93b190e5d1c2c46af0b9c27e6bd7ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Sun, 28 Feb 2016 22:12:58 +0100 Subject: [PATCH 167/206] msr-tools: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The MSR Tools project provides utilities to access x86 processor MSRs and CPU ID directly. https://01.org/msr-tools Signed-off-by: Vincent Stehlé Cc: Yegor Yefremov Cc: Arnout Vandecappelle [Thomas: - rewrap Config.in help text - use $(TARGET_MAKE_ENV) when calling $(MAKE).] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/msr-tools/Config.in | 14 ++++++++++++++ package/msr-tools/msr-tools.hash | 2 ++ package/msr-tools/msr-tools.mk | 21 +++++++++++++++++++++ 4 files changed, 38 insertions(+) create mode 100644 package/msr-tools/Config.in create mode 100644 package/msr-tools/msr-tools.hash create mode 100644 package/msr-tools/msr-tools.mk diff --git a/package/Config.in b/package/Config.in index 67a25148e7..03876be5aa 100644 --- a/package/Config.in +++ b/package/Config.in @@ -407,6 +407,7 @@ endif source "package/memtest86/Config.in" source "package/memtester/Config.in" source "package/minicom/Config.in" + source "package/msr-tools/Config.in" source "package/nanocom/Config.in" source "package/neard/Config.in" source "package/nvidia-driver/Config.in" diff --git a/package/msr-tools/Config.in b/package/msr-tools/Config.in new file mode 100644 index 0000000000..dde19f7897 --- /dev/null +++ b/package/msr-tools/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_MSR_TOOLS + bool "msr-tools" + depends on BR2_i386 || BR2_x86_64 + help + The MSR Tools project provides utilities to access x86 + processor MSRs and CPU ID directly. + + Those tools access the hardware through the + /dev/cpu//msr and /dev/cpu//cpuid devices. This + necessitates msr and cpuid support in the kernel, which + means you need a kernel compiled with configuration options + CONFIG_X86_CPUID and CONFIG_X86_MSR enabled. + + https://01.org/msr-tools diff --git a/package/msr-tools/msr-tools.hash b/package/msr-tools/msr-tools.hash new file mode 100644 index 0000000000..18146df51e --- /dev/null +++ b/package/msr-tools/msr-tools.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 9b87245ee091a798184e447066e9e0d7709b7c81f5e6ad55f2b958c1aa50c4a3 msr-tools-1.3.tar.gz diff --git a/package/msr-tools/msr-tools.mk b/package/msr-tools/msr-tools.mk new file mode 100644 index 0000000000..4f84a288d2 --- /dev/null +++ b/package/msr-tools/msr-tools.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# msr-tools +# +################################################################################ + +MSR_TOOLS_VERSION = 1.3 +MSR_TOOLS_SITE = $(call github,01org,msr-tools,msr-tools-$(MSR_TOOLS_VERSION)) +MSR_TOOLS_LICENSE = GPLv2 +MSR_TOOLS_LICENSE_FILES = cpuid.c + +define MSR_TOOLS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) +endef + +define MSR_TOOLS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) install \ + sbindir="$(TARGET_DIR)/usr/sbin" +endef + +$(eval $(generic-package)) From 854debd77c4eaa46fc8d19d1904b81f9a9e1e780 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 20 Feb 2016 23:08:03 +0100 Subject: [PATCH 168/206] qt5tools: new package - host programs: lconvert, lrelease and lupdate - target programs: pixeltool, qtdiag, qtpath and qtplugininfo Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/Config.in | 1 + package/qt5/qt5tools/Config.in | 42 +++++++++++++++++++ package/qt5/qt5tools/qt5tools.hash | 2 + package/qt5/qt5tools/qt5tools.mk | 66 ++++++++++++++++++++++++++++++ 4 files changed, 111 insertions(+) create mode 100644 package/qt5/qt5tools/Config.in create mode 100644 package/qt5/qt5tools/qt5tools.hash create mode 100644 package/qt5/qt5tools/qt5tools.mk diff --git a/package/qt5/Config.in b/package/qt5/Config.in index ad6226e07c..1c42102c94 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -42,6 +42,7 @@ source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" +source "package/qt5/qt5tools/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in" diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in new file mode 100644 index 0000000000..9e939f2c4c --- /dev/null +++ b/package/qt5/qt5tools/Config.in @@ -0,0 +1,42 @@ +config BR2_PACKAGE_QT5TOOLS + bool "qt5tools" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5tools module. + + http://qt.io + +if BR2_PACKAGE_QT5TOOLS + +config BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS + bool "Linguist host tools (lconvert, lrelease, lupdate)" + help + This option enables the linguist host tools + lconvert, lrelease and lupdate. + +config BR2_PACKAGE_QT5TOOLS_PIXELTOOL + bool "pixeltool" + select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5BASE_PNG # saving png images + help + Compile and install the pixeltool program. + +config BR2_PACKAGE_QT5TOOLS_QTDIAG + bool "qtdiag" + help + Compile and install the qtdiag program. + +config BR2_PACKAGE_QT5TOOLS_QTPATHS + bool "qtpaths" + help + Compile and install the qtpaths program. + +config BR2_PACKAGE_QT5TOOLS_QTPLUGININFO + bool "qtplugininfo" + help + Compile and install the qtplugininfo program. + +endif diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash new file mode 100644 index 0000000000..f54c94ae5f --- /dev/null +++ b/package/qt5/qt5tools/qt5tools.hash @@ -0,0 +1,2 @@ +# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz.mirrorlist +sha256 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd qttools-opensource-src-5.5.1.tar.xz diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk new file mode 100644 index 0000000000..f3d78ce815 --- /dev/null +++ b/package/qt5/qt5tools/qt5tools.mk @@ -0,0 +1,66 @@ +################################################################################ +# +# qt5tools +# +################################################################################ + +QT5TOOLS_VERSION = $(QT5_VERSION) +QT5TOOLS_SITE = $(QT5_SITE) +QT5TOOLS_SOURCE = qttools-opensource-src-$(QT5BASE_VERSION).tar.xz + +QT5TOOLS_DEPENDENCIES = qt5base +QT5TOOLS_INSTALL_STAGING = YES + +# linguist tools compile conditionally on qtHaveModule(qmldevtools-private), +# but the condition is used only used to decide if lupdate will support +# parsing qml files (via setting QT_NO_QML define), no linking against +# target qt5 will happen +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +QT5TOOLS_DEPENDENCIES += qt5declarative +endif + +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5TOOLS_LICENSE = LGPLv2.1 with exception or LGPLv3 +QT5TOOLS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 +else +QT5TOOLS_LICENSE = Commercial license +QT5TOOLS_REDISTRIBUTE = NO +endif + +QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \ + linguist/lconvert linguist/lrelease linguist/lupdate +ifeq ($(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS),y) +# use install target to copy cmake module files +define QT5TOOLS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src/linguist install +endef +endif + +QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_PIXELTOOL) += pixeltool +QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_PIXELTOOL) += pixeltool + +QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTDIAG) += qtdiag +QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTDIAG) += qtdiag + +QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths +QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths + +QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo +QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo + +define QT5TOOLS_CONFIGURE_CMDS + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) +endef + +define QT5TOOLS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) sub-src-qmake_all + $(foreach p,$(QT5TOOLS_BUILD_DIRS_y), \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src/$(p)$(sep)) +endef + +define QT5TOOLS_INSTALL_TARGET_CMDS + $(foreach p,$(QT5TOOLS_INSTALL_TARGET_y), \ + $(INSTALL) -D -m0755 $(@D)/bin/$(p) $(TARGET_DIR)/usr/bin/$(p)$(sep)) +endef + +$(eval $(generic-package)) From 05429cb4e0127fd45242a51c6a0ccb278dbce378 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 29 Feb 2016 12:27:25 -0300 Subject: [PATCH 169/206] xerces: enable parallel builds It seems to be in place for historical reasons since it seems to build just fine on my test rigs. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/xerces/xerces.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index cf3618378a..92b0b70562 100644 --- a/package/xerces/xerces.mk +++ b/package/xerces/xerces.mk @@ -9,7 +9,6 @@ XERCES_SOURCE = xerces-c-$(XERCES_VERSION).tar.xz XERCES_SITE = http://archive.apache.org/dist/xerces/c/3/sources XERCES_LICENSE = Apache-2.0 XERCES_LICENSE_FILES = LICENSE -XERCES_MAKE = $(MAKE1) XERCES_INSTALL_STAGING = YES XERCES_CONF_OPTS = \ --disable-threads \ From 22f19a1cbf008c78df14eaf717514eb00827f2ec Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 29 Feb 2016 08:59:48 -0300 Subject: [PATCH 170/206] cryptsetup: bump to version 1.7.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 8fbbc7d3fb..0928627ad9 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/sha256sums.asc -sha256 075524a7cc0db36d12119fa79116750accb1c6c8825d5faa2534b74b8ce3d148 cryptsetup-1.7.0.tar.xz +sha256 73dc8a63cc984b56aa6a3c99f355262471bcfe78b3240b8b9d0caa8002911fec cryptsetup-1.7.1.tar.xz diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 986b131eb3..4d377099c3 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 1.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf \ From 045fd769bd0be6057ff67cc6b2f6d50b1e149d0b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 29 Feb 2016 08:59:49 -0300 Subject: [PATCH 171/206] lvm2: bump to version 2.02.144 Signed-off-by: Gustavo Zacarias 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 17434ff99d..8390596b9d 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,2 +1,2 @@ # From ftp://sources.redhat.com/pub/lvm2/releases/sha512.sum -sha512 d827cbd5dde6079f9fedb6bd64025d33a93a00cd1af6d57873be78df07069c5b9921077d6be98a6445829cfea28ba7a5520db0be58d6e7a7824f1a722d739fb6 LVM2.2.02.138.tgz +sha512 7689a7a26af6ba8fa5a46a96f3bf757c149806f813740b2df004692a63f05cfc522321d67984d34a1c34d55eb1dab5513b2a6bc48c46a7daec873607ea3ada39 LVM2.2.02.144.tgz diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 0d0dc2c83e..74e0e4fe79 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.02.138 +LVM2_VERSION = 2.02.144 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_INSTALL_STAGING = YES From 0c62637bdd473236d50ec459c9074ad8a8834129 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 29 Feb 2016 08:59:32 -0300 Subject: [PATCH 172/206] openssh: bump to version 7.2p1 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/openssh/openssh.hash | 4 ++-- package/openssh/openssh.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index b93b4a9c88..36346e072d 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -# Also from http://www.openssh.com/txt/release-7.1p2 -sha256 dd75f024dcf21e06a0d6421d582690bf987a1f6323e32ad6619392f3bfde6bbd openssh-7.1p2.tar.gz +# Also from http://www.openssh.com/txt/release-7.2 +sha256 973cc37b2f3597e4cf599b09e604e79c0fe5d9b6f595a24e91ed0662860b4ac3 openssh-7.2p1.tar.gz diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 4e97849eec..0e0bcabb71 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION = 7.1p2 +OPENSSH_VERSION = 7.2p1 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3c BSD-2c Public Domain OPENSSH_LICENSE_FILES = LICENCE From d0071cddc0eb2cd7569b2c25d817cabafcef2993 Mon Sep 17 00:00:00 2001 From: "Schenk, Michael" Date: Mon, 29 Feb 2016 06:46:06 +0100 Subject: [PATCH 173/206] lirc-tools: also install to staging This commit adds LIRC_TOOLS_INSTALL_STAGING = YES to the lirc-tools package to get the library headers into sysroot, which is needed to develop lirc based applications. Signed-off-by: Michael Schenk [Thomas: rework commit log.] Signed-off-by: Thomas Petazzoni --- package/lirc-tools/lirc-tools.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk index fbd8aaf932..d366a83828 100644 --- a/package/lirc-tools/lirc-tools.mk +++ b/package/lirc-tools/lirc-tools.mk @@ -10,6 +10,7 @@ LIRC_TOOLS_SITE = http://downloads.sourceforge.net/project/lirc/LIRC/$(LIRC_TOOL LIRC_TOOLS_LICENSE = GPLv2+ LIRC_TOOLS_LICENSE_FILES = COPYING LIRC_TOOLS_DEPENDENCIES = host-pkgconf +LIRC_TOOLS_INSTALL_STAGING = YES LIRC_TOOLS_CONF_OPTS = --without-x From bfebfaec098bb92c255e55914292b7db5bcbccd9 Mon Sep 17 00:00:00 2001 From: Stanislav Vasic Date: Mon, 29 Feb 2016 11:19:23 +0100 Subject: [PATCH 174/206] libasplib: bump version and change source location Signed-off-by: Stanislav Vlasic Signed-off-by: Thomas Petazzoni --- ...1-Fix-linux-detection-with-buildroot.patch | 31 ------------------- package/libasplib/Config.in | 5 +-- package/libasplib/libasplib.hash | 2 +- package/libasplib/libasplib.mk | 4 +-- 4 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 package/libasplib/0001-Fix-linux-detection-with-buildroot.patch diff --git a/package/libasplib/0001-Fix-linux-detection-with-buildroot.patch b/package/libasplib/0001-Fix-linux-detection-with-buildroot.patch deleted file mode 100644 index 66f5185196..0000000000 --- a/package/libasplib/0001-Fix-linux-detection-with-buildroot.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1dc4480e5157e7ac8eb0364446787128f0a156aa Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 20 Dec 2015 22:25:52 +0100 -Subject: [PATCH 1/1] Fix linux detection with buildroot - -Inspired by -http://lists.busybox.net/pipermail/buildroot/2015-July/133312.html - -Patch sent upstream: https://github.com/kodi-adsp/asplib/pull/2 - -Signed-off-by: Bernd Kuhls ---- - asplib_utils/os/asplib_base_os.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/asplib_utils/os/asplib_base_os.h b/asplib_utils/os/asplib_base_os.h -index a2d3b98..9a90b54 100644 ---- a/asplib_utils/os/asplib_base_os.h -+++ b/asplib_utils/os/asplib_base_os.h -@@ -27,7 +27,7 @@ - #define TARGET_WINDOWS - #endif - #include "windows/windows_definitions.h" --#elif defined(__gnu_linux__) -+#elif (defined(__gnu_linux__) || defined(__linux__)) - #if !defined(TARGET_WINDOWS) - #define TARGET_LINUX - #endif --- -2.6.4 - diff --git a/package/libasplib/Config.in b/package/libasplib/Config.in index 71ccfa0176..89d5448473 100644 --- a/package/libasplib/Config.in +++ b/package/libasplib/Config.in @@ -1,14 +1,11 @@ config BR2_PACKAGE_LIBASPLIB bool "libasplib" depends on BR2_INSTALL_LIBSTDCPP - # needs from the compiler - depends on BR2_i386 || BR2_x86_64 help asplib (Achim's Signal Processing LIBrary), is a small and lightweight C++ library for digital signal processing. - https://github.com/kodi-adsp/asplib + https://github.com/AchimTuran/asplib comment "asplib needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_i386 || BR2_x86_64 diff --git a/package/libasplib/libasplib.hash b/package/libasplib/libasplib.hash index 96c6a2c1e5..bbd027dda5 100644 --- a/package/libasplib/libasplib.hash +++ b/package/libasplib/libasplib.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8979cbd1620dde0603f596d2d05d300355f07e42637bb41ecd564541fa1332f4 libasplib-2fac1bf34efd210b95949fddcbd4a12d287d3e82.tar.gz +sha256 ccc2718c79a8d684317cc1987ede88b198e1602df47d0f18f03d474eda00af9c libasplib-f7219142e790a329b002a94f3db943abcb183739.tar.gz diff --git a/package/libasplib/libasplib.mk b/package/libasplib/libasplib.mk index 27629f56c6..41aeaeb8a2 100644 --- a/package/libasplib/libasplib.mk +++ b/package/libasplib/libasplib.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBASPLIB_VERSION = 2fac1bf34efd210b95949fddcbd4a12d287d3e82 -LIBASPLIB_SITE = $(call github,kodi-adsp,asplib,$(LIBASPLIB_VERSION)) +LIBASPLIB_VERSION = f7219142e790a329b002a94f3db943abcb183739 +LIBASPLIB_SITE = $(call github,AchimTuran,asplib,$(LIBASPLIB_VERSION)) LIBASPLIB_LICENSE = GPLv3+ LIBASPLIB_LICENSE_FILES = LICENSE LIBASPLIB_INSTALL_STAGING = YES From 8ad38a4fc2007df4bee9a941aed46c8771b6a84c Mon Sep 17 00:00:00 2001 From: Gabe Evans Date: Thu, 25 Feb 2016 21:55:10 +0000 Subject: [PATCH 175/206] package/lz4: bump version to r131 systemd v228 requires lz4 >= 125 Signed-off-by: Gabe Evans [Thomas: only pass PREFIX=/usr at install time instead of using LZ4_MAKE_OPTS, and also pass it for the host installation.] Signed-off-by: Thomas Petazzoni --- package/lz4/lz4.hash | 2 ++ package/lz4/lz4.mk | 15 +++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 package/lz4/lz4.hash diff --git a/package/lz4/lz4.hash b/package/lz4/lz4.hash new file mode 100644 index 0000000000..1281284697 --- /dev/null +++ b/package/lz4/lz4.hash @@ -0,0 +1,2 @@ +# sha256 locally computed +sha256 9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed lz4-r131.tar.gz diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk index 38e10d8dfc..576b2a2273 100644 --- a/package/lz4/lz4.mk +++ b/package/lz4/lz4.mk @@ -4,7 +4,7 @@ # ################################################################################ -LZ4_VERSION = r123 +LZ4_VERSION = r131 LZ4_SITE = $(call github,Cyan4973,lz4,$(LZ4_VERSION)) LZ4_INSTALL_STAGING = YES LZ4_LICENSE = BSD-2c @@ -12,7 +12,7 @@ LZ4_LICENSE_FILES = LICENSE ifeq ($(BR2_STATIC_LIBS),y) define LZ4_DISABLE_SHARED - $(SED) '/SHARED/d' $(@D)/Makefile + $(SED) '/SHARED/d' $(@D)/lib/Makefile endef LZ4_POST_PATCH_HOOKS += LZ4_DISABLE_SHARED endif @@ -22,19 +22,22 @@ define HOST_LZ4_BUILD_CMDS endef define HOST_LZ4_INSTALL_CMDS - $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) install DESTDIR=$(HOST_DIR) + $(MAKE) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) \ + PREFIX=/usr install -C $(@D) endef define LZ4_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) liblz4 + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/lib endef define LZ4_INSTALL_STAGING_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install DESTDIR=$(STAGING_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \ + PREFIX=/usr install -C $(@D) endef define LZ4_INSTALL_TARGET_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install DESTDIR=$(TARGET_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ + PREFIX=/usr install -C $(@D)/lib endef $(eval $(generic-package)) From e5a073ac021656dda1e734314d4bbea83a1c6e74 Mon Sep 17 00:00:00 2001 From: Gabe Evans Date: Thu, 25 Feb 2016 21:55:11 +0000 Subject: [PATCH 176/206] package/systemd: remove BR2_PACKAGE_SYSTEMD_ALL_EXTRAS The option was a bit misleading since it only selected additional libraries without --enable/disabling any features. Including all of them here would add a lot of bloat so instead, it is replaced with notes detailing which features each library enables. Signed-off-by: Gabe Evans [Thomas: - slightly tweak Config.in help text, as suggested by Arnout. - add Config.in.legacy handling for BR2_PACKAGE_SYSTEMD_ALL_EXTRAS, as suggested by Arnout.] Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 10 ++++++++++ package/systemd/Config.in | 11 +++-------- package/systemd/systemd.mk | 16 ++++++++++------ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 1cd26979d7..69b3c845d3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,16 @@ endif ############################################################################### comment "Legacy options removed in 2016.02" +config BR2_PACKAGE_SYSTEMD_ALL_EXTRAS + bool "systemd all extras option has been removed" + select BR2_LEGACY + select BR2_PACKAGE_XZ + select BR2_PACKAGE_LIBGCRYPT + help + The systemd option to enable "all extras" has been + removed. To get the same features, the libgcrypt and xz + package should now be enabled. + config BR2_GCC_VERSION_4_5_X bool "gcc 4.5.x has been removed" select BR2_LEGACY diff --git a/package/systemd/Config.in b/package/systemd/Config.in index f7fc3bbfde..b7eca3a64b 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -56,6 +56,9 @@ config BR2_PACKAGE_SYSTEMD The selection of other packages will enable some features: - acl package will add support for multi-seat. + - xz package will add compression support in journal and coredump. + - libgcrypt package will add support for journal sealing and + DNSSEC verification in resolved. http://freedesktop.org/wiki/Software/systemd @@ -64,14 +67,6 @@ if BR2_PACKAGE_SYSTEMD config BR2_PACKAGE_PROVIDES_UDEV default "systemd" -config BR2_PACKAGE_SYSTEMD_ALL_EXTRAS - bool "enable all extras" - select BR2_PACKAGE_XZ - select BR2_PACKAGE_LIBGCRYPT - help - Enable extra features for Systemd: journal compression and - signing. - config BR2_PACKAGE_SYSTEMD_KDBUS bool "enable kdbus support" help diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b2cce11b09..9f2dc51798 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -80,16 +80,20 @@ else SYSTEMD_CONF_OPTS += --disable-kdbus endif -ifeq ($(BR2_PACKAGE_SYSTEMD_ALL_EXTRAS),y) -SYSTEMD_DEPENDENCIES += xz libgcrypt +ifeq ($(BR2_PACKAGE_XZ),y) +SYSTEMD_DEPENDENCIES += xz +SYSTEMD_CONF_OPTS += --enable-xz +else +SYSTEMD_CONF_OPTS += --disable-xz +endif + +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +SYSTEMD_DEPENDENCIES += libgcrypt SYSTEMD_CONF_OPTS += \ - --enable-xz \ --enable-gcrypt \ --with-libgcrypt-prefix=$(STAGING_DIR)/usr else -SYSTEMD_CONF_OPTS += \ - --disable-xz \ - --disable-gcrypt +SYSTEMD_CONF_OPTS += --disable-gcrypt endif ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y) From 22c571c7857a9e582e48ceceb20d1f50339c7848 Mon Sep 17 00:00:00 2001 From: Gabe Evans Date: Thu, 25 Feb 2016 21:55:12 +0000 Subject: [PATCH 177/206] package/systemd: add --enable/disable-bzip2 Signed-off-by: Gabe Evans Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 9f2dc51798..3dffbc9544 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -80,6 +80,13 @@ else SYSTEMD_CONF_OPTS += --disable-kdbus endif +ifeq ($(BR2_PACKAGE_BZIP2),y) +SYSTEMD_DEPENDENCIES += bzip2 +SYSTEMD_CONF_OPTS += --enable-bzip2 +else +SYSTEMD_CONF_OPTS += --disable-bzip2 +endif + ifeq ($(BR2_PACKAGE_XZ),y) SYSTEMD_DEPENDENCIES += xz SYSTEMD_CONF_OPTS += --enable-xz From 3734336b59f78051194bfda930f64e75b3f576aa Mon Sep 17 00:00:00 2001 From: Gabe Evans Date: Thu, 25 Feb 2016 21:55:13 +0000 Subject: [PATCH 178/206] package/systemd: add --enable/disable-lz4 Signed-off-by: Gabe Evans Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/systemd/Config.in | 3 ++- package/systemd/systemd.mk | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index b7eca3a64b..afa598b2ce 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -56,7 +56,8 @@ config BR2_PACKAGE_SYSTEMD The selection of other packages will enable some features: - acl package will add support for multi-seat. - - xz package will add compression support in journal and coredump. + - xz and/or l4 packages will add compression support in + journal and coredump. - libgcrypt package will add support for journal sealing and DNSSEC verification in resolved. diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 3dffbc9544..16c4d52ae9 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -87,6 +87,13 @@ else SYSTEMD_CONF_OPTS += --disable-bzip2 endif +ifeq ($(BR2_PACKAGE_LZ4),y) +SYSTEMD_DEPENDENCIES += lz4 +SYSTEMD_CONF_OPTS += --enable-lz4 +else +SYSTEMD_CONF_OPTS += --disable-lz4 +endif + ifeq ($(BR2_PACKAGE_XZ),y) SYSTEMD_DEPENDENCIES += xz SYSTEMD_CONF_OPTS += --enable-xz From be207535d8850b8f6d15b70b321af3ea78e0f2a3 Mon Sep 17 00:00:00 2001 From: Gabe Evans Date: Thu, 25 Feb 2016 21:55:14 +0000 Subject: [PATCH 179/206] package/systemd: add --enable/disable-zlib Signed-off-by: Gabe Evans Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 16c4d52ae9..91da61bbe1 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -101,6 +101,13 @@ else SYSTEMD_CONF_OPTS += --disable-xz endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +SYSTEMD_DEPENDENCIES += zlib +SYSTEMD_CONF_OPTS += --enable-zlib +else +SYSTEMD_CONF_OPTS += --disable-zlib +endif + ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) SYSTEMD_DEPENDENCIES += libgcrypt SYSTEMD_CONF_OPTS += \ From 1661d6678187e92e4ce13d6de03ba24ae0cbba1d Mon Sep 17 00:00:00 2001 From: Gabe Evans Date: Thu, 25 Feb 2016 21:55:15 +0000 Subject: [PATCH 180/206] package/systemd: add --enable/disable-libcurl Signed-off-by: Gabe Evans Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/systemd/Config.in | 1 + package/systemd/systemd.mk | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index afa598b2ce..ace385a086 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -58,6 +58,7 @@ config BR2_PACKAGE_SYSTEMD - acl package will add support for multi-seat. - xz and/or l4 packages will add compression support in journal and coredump. + - libcurl package will add support for systemd-journal-upload. - libgcrypt package will add support for journal sealing and DNSSEC verification in resolved. diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 91da61bbe1..068156113d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -108,6 +108,13 @@ else SYSTEMD_CONF_OPTS += --disable-zlib endif +ifeq ($(BR2_PACKAGE_LIBCURL),y) +SYSTEMD_DEPENDENCIES += libcurl +SYSTEMD_CONF_OPTS += --enable-libcurl +else +SYSTEMD_CONF_OPTS += --disable-libcurl +endif + ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) SYSTEMD_DEPENDENCIES += libgcrypt SYSTEMD_CONF_OPTS += \ From a1a4b2809e8f7668e920152fdf3b26d59cbd1c6a Mon Sep 17 00:00:00 2001 From: Gabe Evans Date: Thu, 25 Feb 2016 21:55:16 +0000 Subject: [PATCH 181/206] package/systemd: explicitly --enable-microhttpd Signed-off-by: Gabe Evans Reviewed-by: Arnout Vandecappelle (Essensium/Mind) [Thomas: fix commit title.] Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 068156113d..87fdbd7f6e 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -126,6 +126,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y) SYSTEMD_DEPENDENCIES += libmicrohttpd +SYSTEMD_CONF_OPTS += --enable-microhttpd else SYSTEMD_CONF_OPTS += --disable-microhttpd endif From f7afdc7043b097f41bcdee3954e9a32267b8256c Mon Sep 17 00:00:00 2001 From: Gabe Evans Date: Thu, 25 Feb 2016 21:55:17 +0000 Subject: [PATCH 182/206] package/systemd: remove networkd depends from timesyncd systemd-timesyncd can function without systemd-networkd. Signed-off-by: Gabe Evans Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/systemd/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index ace385a086..89427ccba8 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -98,7 +98,6 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD config BR2_PACKAGE_SYSTEMD_TIMESYNCD bool "enable SNTP client" - depends on BR2_PACKAGE_SYSTEMD_NETWORKD help systemd-timesyncd is a service that may be used to synchronize the local system clock with a Network Time Protocol Server. From 83364d15187f06132624c41aa1ce3d226455b821 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 29 Feb 2016 22:51:57 +0100 Subject: [PATCH 183/206] package/systemd: fix wrong capitalization Reported-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/systemd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 89427ccba8..e9a7883982 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -100,7 +100,7 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD bool "enable SNTP client" help systemd-timesyncd is a service that may be used to synchronize the - local system clock with a Network Time Protocol Server. + local system clock with a Network Time Protocol server. This simple NTP solution is an alternative to sntp/ntpd from the ntp package. From 0d8485bc7531b04b05c26878b1e961cd9df62512 Mon Sep 17 00:00:00 2001 From: Gabe Evans Date: Thu, 25 Feb 2016 21:55:19 +0000 Subject: [PATCH 184/206] package/systemd: add optional support for binfmt Signed-off-by: Gabe Evans [Thomas: rewrap Config.in help text.] Signed-off-by: Thomas Petazzoni --- package/systemd/Config.in | 8 ++++++++ package/systemd/systemd.mk | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index e9a7883982..6289252a3c 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -84,6 +84,14 @@ config BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY http://www.freedesktop.org/software/systemd/man/systemd-journal-gatewayd.service.html +config BR2_PACKAGE_SYSTEMD_BINFMT + bool "enable binfmt tool" + help + systemd-binfmt is an early boot service that registers + additional binary formats for executables in the kernel. + + http://www.freedesktop.org/software/systemd/man/systemd-binfmt.service.html + config BR2_PACKAGE_SYSTEMD_NETWORKD bool "enable network manager" help diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 87fdbd7f6e..5f7941c357 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -131,6 +131,12 @@ else SYSTEMD_CONF_OPTS += --disable-microhttpd endif +ifeq ($(BR2_PACKAGE_SYSTEMD_BINFMT),y) +SYSTEMD_CONF_OPTS += --enable-binfmt +else +SYSTEMD_CONF_OPTS += --disable-binfmt +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += --enable-networkd define SYSTEMD_INSTALL_RESOLVCONF_HOOK From f01ad723db77148889c2ae9cfdd7ab6eeb83b036 Mon Sep 17 00:00:00 2001 From: Gabe Evans Date: Thu, 25 Feb 2016 21:55:20 +0000 Subject: [PATCH 185/206] package/systemd: add optional support for vconsole Signed-off-by: Gabe Evans [Thomas: rewrap Config.in help text.] Signed-off-by: Thomas Petazzoni --- package/systemd/Config.in | 8 ++++++++ package/systemd/systemd.mk | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 6289252a3c..f1cd465c81 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -92,6 +92,14 @@ config BR2_PACKAGE_SYSTEMD_BINFMT http://www.freedesktop.org/software/systemd/man/systemd-binfmt.service.html +config BR2_PACKAGE_SYSTEMD_VCONSOLE + bool "enable vconsole tool" + help + systemd-vconsole-setup is an early boot service that + configures the virtual console font and console keymap. + + http://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html + config BR2_PACKAGE_SYSTEMD_NETWORKD bool "enable network manager" help diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 5f7941c357..124119fb27 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -137,6 +137,12 @@ else SYSTEMD_CONF_OPTS += --disable-binfmt endif +ifeq ($(BR2_PACKAGE_SYSTEMD_VCONSOLE),y) +SYSTEMD_CONF_OPTS += --enable-vconsole +else +SYSTEMD_CONF_OPTS += --disable-vconsole +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += --enable-networkd define SYSTEMD_INSTALL_RESOLVCONF_HOOK From 41304124f2e0e717ef6bb9e6bf8b0c61c2fba745 Mon Sep 17 00:00:00 2001 From: Gabe Evans Date: Thu, 25 Feb 2016 21:55:21 +0000 Subject: [PATCH 186/206] package/systemd: add optional support for bootchart Signed-off-by: Gabe Evans [Thomas: rewrap Config.in help text.] Signed-off-by: Thomas Petazzoni --- package/systemd/Config.in | 10 ++++++++++ package/systemd/systemd.mk | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index f1cd465c81..85dcf07639 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -100,6 +100,16 @@ config BR2_PACKAGE_SYSTEMD_VCONSOLE http://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html +config BR2_PACKAGE_SYSTEMD_BOOTCHART + bool "enable bootchart tool" + help + systemd-bootchart is a tool, usually run at system startup, + that collects the CPU load, disk load, memory usage, as well + as per-process information from a running system. Collected + results are output as an SVG graph. + + http://www.freedesktop.org/software/systemd/man/systemd-bootchart.html + config BR2_PACKAGE_SYSTEMD_NETWORKD bool "enable network manager" help diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 124119fb27..626638836f 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -143,6 +143,12 @@ else SYSTEMD_CONF_OPTS += --disable-vconsole endif +ifeq ($(BR2_PACKAGE_SYSTEMD_BOOTCHART),y) +SYSTEMD_CONF_OPTS += --enable-bootchart +else +SYSTEMD_CONF_OPTS += --disable-bootchart +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += --enable-networkd define SYSTEMD_INSTALL_RESOLVCONF_HOOK From 6149e121727acde3d54c528153c7c25baeaf925a Mon Sep 17 00:00:00 2001 From: Gabe Evans Date: Thu, 25 Feb 2016 21:55:22 +0000 Subject: [PATCH 187/206] package/systemd: add optional support for quotacheck Signed-off-by: Gabe Evans [Thomas: rewrap Config.in help text.] Signed-off-by: Thomas Petazzoni --- package/systemd/Config.in | 10 ++++++++++ package/systemd/systemd.mk | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 85dcf07639..97d48c4124 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -110,6 +110,16 @@ config BR2_PACKAGE_SYSTEMD_BOOTCHART http://www.freedesktop.org/software/systemd/man/systemd-bootchart.html +config BR2_PACKAGE_SYSTEMD_QUOTACHECK + bool "enable quotacheck tools" + help + systemd-quotacheck is a service responsible for file system + quota checks. It is run once at boot after all necessary + file systems are mounted. It is pulled in only if at least + one file system has quotas enabled. + + http://www.freedesktop.org/software/systemd/man/systemd-quotacheck.service.html + config BR2_PACKAGE_SYSTEMD_NETWORKD bool "enable network manager" help diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 626638836f..b1d347d854 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -149,6 +149,12 @@ else SYSTEMD_CONF_OPTS += --disable-bootchart endif +ifeq ($(BR2_PACKAGE_SYSTEMD_QUOTACHECK),y) +SYSTEMD_CONF_OPTS += --enable-quotacheck +else +SYSTEMD_CONF_OPTS += --disable-quotacheck +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += --enable-networkd define SYSTEMD_INSTALL_RESOLVCONF_HOOK From 2b9a7128e7b0d861e01088b780eb246aa07dec70 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 22 Feb 2016 09:07:24 -0300 Subject: [PATCH 188/206] glibc: remove version 2.21 Mask out glibc for sparc as well since it's no longer available. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/glibc/Config.in | 4 ---- package/glibc/glibc.hash | 1 - toolchain/toolchain-buildroot/Config.in | 5 ++--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/package/glibc/Config.in b/package/glibc/Config.in index f839e29269..0565162433 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -34,9 +34,6 @@ choice prompt "glibc version" default BR2_GLIBC_VERSION_2_22 -config BR2_GLIBC_VERSION_2_21 - bool "2.21" - config BR2_GLIBC_VERSION_2_22 bool "2.22" # No support for pthread barriers on < v9 ISA @@ -55,6 +52,5 @@ config BR2_GLIBC_VERSION_STRING string default "2.18-svnr23787" if BR2_EGLIBC_VERSION_2_18 default "2.19-svnr25243" if BR2_EGLIBC_VERSION_2_19 - default "2.21" if BR2_GLIBC_VERSION_2_21 default "2.22" if BR2_GLIBC_VERSION_2_22 default "2.23" if BR2_GLIBC_VERSION_2_23 diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index c8097357a5..b04f214741 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -4,6 +4,5 @@ md5 b395b021422a027d89884992e91734fc eglibc-2.18-svnr23787.tar.bz2 sha1 224d9e655e8f0ad04ffde47b97a11c64e2255b56 eglibc-2.18-svnr23787.tar.bz2 md5 197836c2ba42fb146e971222647198dd eglibc-2.19-svnr25243.tar.bz2 sha1 8013c1935b46fd50d2d1fbfad3b0af362b75fb28 eglibc-2.19-svnr25243.tar.bz2 -sha256 aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8 glibc-2.21.tar.xz sha256 eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948 glibc-2.22.tar.xz sha256 94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 glibc-2.23.tar.xz diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index cbeb0305b2..37c662407f 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -68,9 +68,8 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC BR2_aarch64_be || BR2_i386 || BR2_mips || \ BR2_mipsel || BR2_mips64 || BR2_mips64el|| \ BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_sh || BR2_sh64 || BR2_sparc || \ - BR2_sparc64 || BR2_x86_64 || BR2_microblaze || \ - BR2_nios2 + BR2_sh || BR2_sh64 || BR2_sparc64 || \ + BR2_x86_64 || BR2_microblaze || BR2_nios2 depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS depends on !BR2_powerpc_SPE From 2661c4f1b715d4ea3df41c4c86373f64bf4a5b6b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 29 Feb 2016 23:11:38 +0100 Subject: [PATCH 189/206] Config.in.legacy: fix separator for 2016.05 legacy options Since we opened up the next branch, a number of options have been added to Config.in.legacy. However, they are located under the "legacy options removed in 2016.02", which is not correct. This commit fixes that by adding the "legacy options removed in 2016.05" header, and restoring the one related to 2016.02 at the right location. Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 69b3c845d3..53baa84f56 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -143,7 +143,7 @@ comment "----------------------------------------------------" endif ############################################################################### -comment "Legacy options removed in 2016.02" +comment "Legacy options removed in 2016.05" config BR2_PACKAGE_SYSTEMD_ALL_EXTRAS bool "systemd all extras option has been removed" @@ -173,6 +173,9 @@ config BR2_PACKAGE_SQLITE_READLINE command-line editing should be enabled, it also also takes libedit into account. +############################################################################### +comment "Legacy options removed in 2016.02" + config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL bool "openpowerlink debug option has been removed" select BR2_LEGACY From c8cca4c192e1890b2f1fbe422d8b63e405b46f67 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 29 Feb 2016 23:17:06 +0100 Subject: [PATCH 190/206] package/lz4: only use PREFIX for host installation As noted by Peter Korsgaard, using DESTDIR=$(HOST_DIR) and PREFIX=/usr for the host installation is useless and actually incorrect (the pkg-config file contains incorrect paths). Instead, using PREFIX=$(HOST_DIR)/usr is simpler, and actually correct. Signed-off-by: Thomas Petazzoni --- package/lz4/lz4.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk index 576b2a2273..d2b09bbae4 100644 --- a/package/lz4/lz4.mk +++ b/package/lz4/lz4.mk @@ -22,8 +22,8 @@ define HOST_LZ4_BUILD_CMDS endef define HOST_LZ4_INSTALL_CMDS - $(MAKE) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) \ - PREFIX=/usr install -C $(@D) + $(MAKE) $(HOST_CONFIGURE_OPTS) PREFIX=$(HOST_DIR)/usr \ + install -C $(@D) endef define LZ4_BUILD_CMDS From 56b80ece6318c35ca6115d751e24738612501988 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 23:09:06 +0100 Subject: [PATCH 191/206] package/kodi-visualisation-goom: new package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 ++++ .../0001-cross-compile.patch | 32 +++++++++++++++++++ package/kodi-visualisation-goom/Config.in | 10 ++++++ .../kodi-visualisation-goom.hash | 2 ++ .../kodi-visualisation-goom.mk | 14 ++++++++ package/kodi/Config.in | 10 +----- package/kodi/kodi.mk | 7 +--- 7 files changed, 67 insertions(+), 15 deletions(-) create mode 100644 package/kodi-visualisation-goom/0001-cross-compile.patch create mode 100644 package/kodi-visualisation-goom/Config.in create mode 100644 package/kodi-visualisation-goom/kodi-visualisation-goom.hash create mode 100644 package/kodi-visualisation-goom/kodi-visualisation-goom.mk diff --git a/Config.in.legacy b/Config.in.legacy index 53baa84f56..3def8a1224 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,13 @@ endif ############################################################################### comment "Legacy options removed in 2016.05" +config BR2_PACKAGE_KODI_GOOM + bool "Goom support in Kodi was moved to an addon" + select BR2_LEGACY + select BR2_PACKAGE_KODI_VISUALISATION_GOOM + help + Goom support in Kodi was moved to an addon + config BR2_PACKAGE_SYSTEMD_ALL_EXTRAS bool "systemd all extras option has been removed" select BR2_LEGACY diff --git a/package/kodi-visualisation-goom/0001-cross-compile.patch b/package/kodi-visualisation-goom/0001-cross-compile.patch new file mode 100644 index 0000000000..8dd0fe9109 --- /dev/null +++ b/package/kodi-visualisation-goom/0001-cross-compile.patch @@ -0,0 +1,32 @@ +Fix cross-compilation + +Use the cross-compiler and not the host version. + +Patch sent upstream: +https://github.com/notspiff/visualization.goom/pull/4 + +Signed-off-by: Bernd Kuhls + +diff -uNr visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305.org/CMakeLists.txt visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305/CMakeLists.txt +--- visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305.org/CMakeLists.txt 2014-10-31 11:34:21.000000000 +0100 ++++ visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305/CMakeLists.txt 2015-07-19 19:49:43.340054342 +0200 +@@ -13,6 +13,10 @@ + ${KODI_INCLUDE_DIR} + ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/src) + ++get_filename_component( COMPILER_FILENAME "${CMAKE_C_COMPILER}" NAME ) ++string( REGEX REPLACE "-[^-]+$" "" ++ TOOLCHAIN_NAME "${COMPILER_FILENAME}" ) ++ + include(ExternalProject) + set(update_command "") + if(BOOTSTRAP_IN_TREE OR NOT DEFINED BOOTSTRAP_IN_TREE) +@@ -20,7 +24,7 @@ + endif() + externalproject_add(libgoom SOURCE_DIR ${PROJECT_SOURCE_DIR}/lib/goom2k4-0 + "${update_command}" +- CONFIGURE_COMMAND ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/configure --disable-shared --enable-static --with-pic --prefix= ++ CONFIGURE_COMMAND ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/configure --disable-shared --enable-static --with-pic --prefix= --host=${TOOLCHAIN_NAME} + BUILD_COMMAND ${MAKE} + INSTALL_COMMAND "") + diff --git a/package/kodi-visualisation-goom/Config.in b/package/kodi-visualisation-goom/Config.in new file mode 100644 index 0000000000..c5fa9827ac --- /dev/null +++ b/package/kodi-visualisation-goom/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_KODI_VISUALISATION_GOOM + bool "kodi-visualisation-goom" + depends on BR2_PACKAGE_KODI_GL + help + GOOM visualiser for Kodi + + https://github.com/notspiff/visualization.goom + +comment "kodi-visualization-goom needs an OpenGL backend" + depends on !BR2_PACKAGE_KODI_GL diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash new file mode 100644 index 0000000000..8507c652a5 --- /dev/null +++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 66a71a5c5a1c0016d7020fcc9941634ee465dab14644cdc96023ce0a28408338 kodi-visualisation-goom-16747b7dba9cbdcfdc8df44e849eaf09450fc86f.tar.gz diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk new file mode 100644 index 0000000000..89f2bab1d6 --- /dev/null +++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# kodi-visualisation-goom +# +################################################################################ + +KODI_VISUALISATION_GOOM_VERSION = 16747b7dba9cbdcfdc8df44e849eaf09450fc86f +KODI_VISUALISATION_GOOM_SITE = $(call github,notspiff,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION)) +KODI_VISUALISATION_GOOM_LICENSE = GPLv2+ +KODI_VISUALISATION_GOOM_LICENSE_FILES = src/Main.cpp + +KODI_VISUALISATION_GOOM_DEPENDENCIES = kodi + +$(eval $(cmake-package)) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 7d28882026..dcddade60d 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -136,15 +136,6 @@ config BR2_PACKAGE_KODI_LIBBLURAY comment "libbluray support needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS -config BR2_PACKAGE_KODI_GOOM - bool "goom screensaver" - depends on BR2_PACKAGE_KODI_GL - help - Enable goom screensaver - -comment "goom needs an OpenGL backend" - depends on !BR2_PACKAGE_KODI_GL - config BR2_PACKAGE_KODI_RSXS bool "rsxs screensaver" depends on BR2_PACKAGE_KODI_GL @@ -308,6 +299,7 @@ menu "Screensavers" endmenu menu "Visualisations" + source "package/kodi-visualisation-goom/Config.in" source "package/kodi-visualisation-shadertoy/Config.in" source "package/kodi-visualisation-spectrum/Config.in" source "package/kodi-visualisation-waveforhue/Config.in" diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index bf3aa7a064..94e59e7a95 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -30,6 +30,7 @@ KODI_CONF_ENV = \ KODI_CONF_OPTS += \ --with-ffmpeg=shared \ + --disable-goom \ --disable-joystick \ --disable-openmax \ --disable-projectm \ @@ -116,12 +117,6 @@ KODI_CONF_OPTS += --disable-gles endif endif -ifeq ($(BR2_PACKAGE_KODI_GOOM),y) -KODI_CONF_OPTS += --enable-goom -else -KODI_CONF_OPTS += --disable-goom -endif - ifeq ($(BR2_PACKAGE_KODI_LIBUSB),y) KODI_DEPENDENCIES += libusb-compat KODI_CONF_OPTS += --enable-libusb From 75ce17d0e15062b6997c7a55e24b70ad96b2685d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 23:09:07 +0100 Subject: [PATCH 192/206] package/kodi-screensaver-rsxs: new package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 ++++ .../0001-cross-compile.patch | 37 +++++++++++++++++++ package/kodi-screensaver-rsxs/Config.in | 10 +++++ .../kodi-screensaver-rsxs.hash | 2 + .../kodi-screensaver-rsxs.mk | 14 +++++++ package/kodi/Config.in | 12 +----- package/kodi/kodi.mk | 20 +--------- 7 files changed, 73 insertions(+), 29 deletions(-) create mode 100644 package/kodi-screensaver-rsxs/0001-cross-compile.patch create mode 100644 package/kodi-screensaver-rsxs/Config.in create mode 100644 package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash create mode 100644 package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk diff --git a/Config.in.legacy b/Config.in.legacy index 3def8a1224..179cf4732c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,13 @@ endif ############################################################################### comment "Legacy options removed in 2016.05" +config BR2_PACKAGE_KODI_RSXS + bool "rsxs support in Kodi was moved to an addon" + select BR2_LEGACY + select BR2_PACKAGE_KODI_SCREENSAVER_RSXS + help + rsxs support in Kodi was moved to an addon + config BR2_PACKAGE_KODI_GOOM bool "Goom support in Kodi was moved to an addon" select BR2_LEGACY diff --git a/package/kodi-screensaver-rsxs/0001-cross-compile.patch b/package/kodi-screensaver-rsxs/0001-cross-compile.patch new file mode 100644 index 0000000000..56c2f4e4ba --- /dev/null +++ b/package/kodi-screensaver-rsxs/0001-cross-compile.patch @@ -0,0 +1,37 @@ +Fix cross-compilation + +Use the cross-compiler and not the host version. + +Patch sent upstream: +https://github.com/notspiff/screensavers.rsxs/pull/5 + +Signed-off-by: Bernd Kuhls + +diff -uNr screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLists.txt screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259/CMakeLists.txt +--- screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLists.txt 2015-03-19 12:20:23.000000000 +0100 ++++ screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259/CMakeLists.txt 2015-07-19 20:26:16.660481032 +0200 +@@ -33,6 +33,11 @@ + ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src/skyrocket + ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src/solarwinds) + ++ ++get_filename_component( COMPILER_FILENAME "${CMAKE_C_COMPILER}" NAME ) ++string( REGEX REPLACE "-[^-]+$" "" ++ TOOLCHAIN_NAME "${COMPILER_FILENAME}" ) ++ + include(ExternalProject) + set(update_command "") + if(BOOTSTRAP_IN_TREE OR NOT DEFINED BOOTSTRAP_IN_TREE) +@@ -46,8 +51,11 @@ + endif() + endif() + externalproject_add(rsxs SOURCE_DIR ${PROJECT_SOURCE_DIR}/${rsxs_dir} +- CONFIGURE_COMMAND ${configure_start} ++ CONFIGURE_COMMAND gl_cv_func_gettimeofday_clobber=no ++ ac_cv_func_malloc_0_nonnull=yes ++ ${configure_start} + --prefix= ++ --host=${TOOLCHAIN_NAME} + --without-xscreensaver + --disable-cyclone + --disable-euphoria diff --git a/package/kodi-screensaver-rsxs/Config.in b/package/kodi-screensaver-rsxs/Config.in new file mode 100644 index 0000000000..da12651a83 --- /dev/null +++ b/package/kodi-screensaver-rsxs/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_KODI_SCREENSAVER_RSXS + bool "kodi-screensaver-rsxs" + depends on BR2_PACKAGE_KODI_GL # libglu + help + RSXS screensaver add-ons for Kodi + + https://github.com/notspiff/screensavers.rsxs + +comment "kodi-screensaver-rsxs needs an OpenGL backend" + depends on !BR2_PACKAGE_KODI_GL diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash new file mode 100644 index 0000000000..568b44b37c --- /dev/null +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 0797ffb720056ea2e04ac8b7ee4fc2dca1e42611ef138b347e928d8d7f3c696f kodi-screensaver-rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.tar.gz diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk new file mode 100644 index 0000000000..c76e9da954 --- /dev/null +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# kodi-screensaver-rsxs +# +################################################################################ + +KODI_SCREENSAVER_RSXS_VERSION = 195e0ec3fbbcb2ee2012cd560e42d05167f0f259 +KODI_SCREENSAVER_RSXS_SITE = $(call github,notspiff,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION)) +KODI_SCREENSAVER_RSXS_LICENSE = GPLv3 +KODI_SCREENSAVER_RSXS_LICENSE_FILES = lib/rsxs-1.0/COPYING + +KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi + +$(eval $(cmake-package)) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index dcddade60d..af5e40b3f1 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -81,9 +81,7 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_TIFF select BR2_PACKAGE_TINYXML select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_KODI_GL - select BR2_PACKAGE_XLIB_LIBXMU if BR2_PACKAGE_KODI_GL # needed by rsxs screensaver select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_KODI_GL - select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_KODI_GL # needed by rsxs screensaver select BR2_PACKAGE_YAJL select BR2_PACKAGE_ZLIB select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support @@ -136,15 +134,6 @@ config BR2_PACKAGE_KODI_LIBBLURAY comment "libbluray support needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS -config BR2_PACKAGE_KODI_RSXS - bool "rsxs screensaver" - depends on BR2_PACKAGE_KODI_GL - help - Enable goom screensaver - -comment "rsxs needs an OpenGL backend" - depends on !BR2_PACKAGE_KODI_GL - config BR2_PACKAGE_KODI_LIBCEC bool "hdmi cec" depends on !BR2_STATIC_LIBS # libcec @@ -295,6 +284,7 @@ menu "Screensavers" source "package/kodi-screensaver-greynetic/Config.in" source "package/kodi-screensaver-pingpong/Config.in" source "package/kodi-screensaver-pyro/Config.in" + source "package/kodi-screensaver-rsxs/Config.in" source "package/kodi-screensaver-stars/Config.in" endmenu diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 94e59e7a95..ef3f1741c1 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -35,6 +35,7 @@ KODI_CONF_OPTS += \ --disable-openmax \ --disable-projectm \ --disable-pulse \ + --disable-rsxs \ --disable-vdpau \ --disable-vtbdecoder \ --enable-optimizations @@ -89,24 +90,8 @@ ifeq ($(BR2_PACKAGE_KODI_GL),y) KODI_DEPENDENCIES += libglew libglu libgl xlib_libX11 xlib_libXext \ xlib_libXmu xlib_libXrandr xlib_libXt libdrm KODI_CONF_OPTS += --enable-gl --enable-x11 --disable-gles -ifeq ($(BR2_PACKAGE_KODI_RSXS),y) -# fix rsxs compile -# gcc5: http://trac.kodi.tv/ticket/16006#comment:6 -# make sure target libpng-config is used, options taken from rsxs-0.9/acinclude.m4 -KODI_CONF_ENV += \ - ac_cv_type__Bool=yes \ - jm_cv_func_gettimeofday_clobber=no \ - mac_cv_pkg_png=$(STAGING_DIR)/usr/bin/libpng-config \ - mac_cv_pkg_cppflags="`$(STAGING_DIR)/usr/bin/libpng-config --I_opts --cppflags`" \ - mac_cv_pkg_cxxflags="`$(STAGING_DIR)/usr/bin/libpng-config --ccopts`" \ - mac_cv_pkg_ldflags="`$(STAGING_DIR)/usr/bin/libpng-config --L_opts --R_opts`" \ - mac_cv_pkg_libs="`$(STAGING_DIR)/usr/bin/libpng-config --libs`" -KODI_CONF_OPTS += --enable-rsxs else -KODI_CONF_OPTS += --disable-rsxs -endif -else -KODI_CONF_OPTS += --disable-gl --disable-rsxs --disable-x11 +KODI_CONF_OPTS += --disable-gl --disable-x11 ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y) KODI_DEPENDENCIES += libegl libgles KODI_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`" @@ -224,7 +209,6 @@ endef KODI_PRE_CONFIGURE_HOOKS += KODI_BOOTSTRAP define KODI_CLEAN_UNUSED_ADDONS - rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/screensaver.rsxs.plasma rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.milkdrop rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.projectm rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.itunes From 89a8178ba5d502b4b049adf87935d26770db99ed Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 23:09:08 +0100 Subject: [PATCH 193/206] package/libplatform: bump version, add hash Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libplatform/libplatform.hash | 2 ++ package/libplatform/libplatform.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 package/libplatform/libplatform.hash diff --git a/package/libplatform/libplatform.hash b/package/libplatform/libplatform.hash new file mode 100644 index 0000000000..8975dfd8ab --- /dev/null +++ b/package/libplatform/libplatform.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 3603ead8b16a48cb35b1e6dea330a693f10552b1a6ea036c5db9ec248cd8baf5 libplatform-feafe68e3e0b02c3261aefb3d711863ef6fadd38.tar.gz diff --git a/package/libplatform/libplatform.mk b/package/libplatform/libplatform.mk index 4eb934f8bf..6d549151d7 100644 --- a/package/libplatform/libplatform.mk +++ b/package/libplatform/libplatform.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPLATFORM_VERSION = 1.0.10 +LIBPLATFORM_VERSION = feafe68e3e0b02c3261aefb3d711863ef6fadd38 LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,$(LIBPLATFORM_VERSION)) LIBPLATFORM_LICENSE = GPLv2+, PHP license v3.01 LIBPLATFORM_LICENSE_FILES = src/os.h src/util/fstrcmp.c From dedf1fb57454bbcd1fa5b591cf36c8a8e335ade3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 23:09:09 +0100 Subject: [PATCH 194/206] package/libcec: bump version, add hash Also remove patch committed upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...rate-an-invalid-env.h-when-not-built.patch | 31 ------------------- package/libcec/libcec.hash | 2 ++ package/libcec/libcec.mk | 2 +- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 package/libcec/0001-fixed-don-t-generate-an-invalid-env.h-when-not-built.patch create mode 100644 package/libcec/libcec.hash diff --git a/package/libcec/0001-fixed-don-t-generate-an-invalid-env.h-when-not-built.patch b/package/libcec/0001-fixed-don-t-generate-an-invalid-env.h-when-not-built.patch deleted file mode 100644 index d823a5b27d..0000000000 --- a/package/libcec/0001-fixed-don-t-generate-an-invalid-env.h-when-not-built.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 369ffb5be23eca520df99732541d0482da271fd3 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Sat, 11 Jul 2015 00:53:17 +0200 -Subject: [PATCH] fixed: don't generate an invalid env.h when not built with - the .git dir present. closes #112 - -Backported from upstream commit 2f32a9debc1f148b5dfcfc463480f1432bb71725. - -Signed-off-by: Thomas Petazzoni ---- - support/git-rev.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/support/git-rev.sh b/support/git-rev.sh -index 5dce3d0..4aadae6 100755 ---- a/support/git-rev.sh -+++ b/support/git-rev.sh -@@ -1,5 +1,8 @@ - #!/bin/sh - - ## cmake doesn't read the variable when it doesn't end with a newline, and I haven't figured out how to have it add a newline directly... --echo -n "`git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h"`\n" -- -+if [ -d .git ]; then -+ echo "`git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h"`" -+else -+ echo "" -+fi --- -2.5.0 - diff --git a/package/libcec/libcec.hash b/package/libcec/libcec.hash new file mode 100644 index 0000000000..377f343a22 --- /dev/null +++ b/package/libcec/libcec.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 0f29d5a2d155b507807ba896bc3b3e50a0ab56bf8f543a2bf5c2798c790292b5 libcec-2c675dac48387c48c7f43c5d2547ef0c4ef5c7dd.tar.gz diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk index c5b008f9b4..b762d88d71 100644 --- a/package/libcec/libcec.mk +++ b/package/libcec/libcec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCEC_VERSION = libcec-3.0.1 +LIBCEC_VERSION = 2c675dac48387c48c7f43c5d2547ef0c4ef5c7dd LIBCEC_SITE = $(call github,Pulse-Eight,libcec,$(LIBCEC_VERSION)) LIBCEC_LICENSE = GPLv2+ LIBCEC_LICENSE_FILES = COPYING From 349c9c4a9e6962960fb20bf5ba651040e6316341 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 23:09:10 +0100 Subject: [PATCH 195/206] package/kodi-platform: bump version, add hash Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-platform/kodi-platform.hash | 2 ++ package/kodi-platform/kodi-platform.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 package/kodi-platform/kodi-platform.hash diff --git a/package/kodi-platform/kodi-platform.hash b/package/kodi-platform/kodi-platform.hash new file mode 100644 index 0000000000..a2484484e3 --- /dev/null +++ b/package/kodi-platform/kodi-platform.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 88741358d5d54a0031553ac28aa63bc56c44d994a76f8651bac94a1e244a6595 kodi-platform-45d6ad1984fdb1dc855076ff18484dbec33939d1.tar.gz diff --git a/package/kodi-platform/kodi-platform.mk b/package/kodi-platform/kodi-platform.mk index 0a7cc2eefc..4b642f9cfe 100644 --- a/package/kodi-platform/kodi-platform.mk +++ b/package/kodi-platform/kodi-platform.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PLATFORM_VERSION = 33b6390b5d2abe5b674f9eb04bdee19228543054 +KODI_PLATFORM_VERSION = 45d6ad1984fdb1dc855076ff18484dbec33939d1 KODI_PLATFORM_SITE = $(call github,xbmc,kodi-platform,$(KODI_PLATFORM_VERSION)) KODI_PLATFORM_LICENSE = GPLv2+ KODI_PLATFORM_LICENSE_FILES = src/util/XMLUtils.h From 6922b41dd8bb5294e9cfcef6ea6678737150a815 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 23:09:11 +0100 Subject: [PATCH 196/206] package/kodi: bump version to 16.0-Jarvis Add two new hard dependencies: - libdcadec https://github.com/xbmc/xbmc/commit/0997117a659a09e7b1c5bcb110f3526ea16698be - libcrossguid https://github.com/xbmc/xbmc/commit/6f8171f53992fc2eaabf71f6fa47ebed1da0d43d Kodi moved to C++11 so we need gcc >= 4.7: https://github.com/xbmc/xbmc/pull/6412 wavpack support was removed in favour of ffmpeg: https://github.com/xbmc/xbmc/commit/7916902c9e6f7a523265594f3ad7f921f93f1cd4 Enabled giflib support by default. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++++++ ...e-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch | 21 +++++++++++-------- package/kodi/Config.in | 20 +++++++----------- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 13 +++--------- 5 files changed, 31 insertions(+), 32 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 179cf4732c..07719679db 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,13 @@ endif ############################################################################### comment "Legacy options removed in 2016.05" +config BR2_PACKAGE_KODI_WAVPACK + bool "wavpack" + select BR2_LEGACY + help + wavpack support was removed in favour of ffmpeg: + https://github.com/xbmc/xbmc/commit/7916902c9e6f7a523265594f3ad7f921f93f1cd4 + config BR2_PACKAGE_KODI_RSXS bool "rsxs support in Kodi was moved to an addon" select BR2_LEGACY diff --git a/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch index 641525cafc..2678a7839e 100644 --- a/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch +++ b/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch @@ -17,14 +17,17 @@ diff --git a/project/cmake/kodi-config.cmake.in b/project/cmake/kodi-config.cmak index 76626ec..ffb8e1d 100644 --- a/project/cmake/kodi-config.cmake.in +++ b/project/cmake/kodi-config.cmake.in -@@ -4,12 +4,12 @@ SET(APP_NAME_UC @APP_NAME_UC@) - SET(APP_VERSION_MAJOR @APP_VERSION_MAJOR@) - SET(APP_VERSION_MINOR @APP_VERSION_MINOR@) - SET(@APP_NAME_UC@_PREFIX @APP_PREFIX@) --SET(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@) --SET(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) -+SET(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@) -+SET(@APP_NAME_UC@_LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@) +@@ -7,15 +7,15 @@ + SET(@APP_NAME_UC@_PREFIX @APP_PREFIX@) + ENDIF() + IF(NOT @APP_NAME_UC@_INCLUDE_DIR) +- SET(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@) ++ SET(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@) + ENDIF() + IF(NOT @APP_NAME_UC@_LIB_DIR) +- SET(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) ++ SET(@APP_NAME_UC@_LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@) + ENDIF() IF(NOT WIN32) SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") ENDIF() @@ -32,7 +35,7 @@ index 76626ec..ffb8e1d 100644 +LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@) ADD_DEFINITIONS(@ARCH_DEFINES@ -DBUILD_KODI_ADDON) - include(addon-helpers) + if(NOT CORE_SYSTEM_NAME) -- 2.5.0 diff --git a/package/kodi/Config.in b/package/kodi/Config.in index af5e40b3f1..09bd0cd4ad 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -2,10 +2,11 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS bool default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) && BR2_PACKAGE_BOOST_ARCH_SUPPORTS -comment "kodi needs a toolchain w/ C++, threads, wchar, dynamic library" +comment "kodi needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.7" depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_USE_WCHAR || BR2_STATIC_LIBS + || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_USE_MMU config BR2_PACKAGE_KODI_EGL_GLES @@ -42,11 +43,14 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_FFMPEG_SWSCALE select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_GIFLIB select BR2_PACKAGE_JASPER select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBASS select BR2_PACKAGE_LIBCDIO + select BR2_PACKAGE_LIBCROSSGUID select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBDCADEC select BR2_PACKAGE_LIBFRIBIDI select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_KODI_GL select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_KODI_GL @@ -86,6 +90,7 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_ZLIB select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL depends on BR2_USE_MMU # python @@ -138,15 +143,13 @@ config BR2_PACKAGE_KODI_LIBCEC bool "hdmi cec" depends on !BR2_STATIC_LIBS # libcec depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # libcec select BR2_PACKAGE_LIBCEC help Enable CEC (Consumer Electronics Control) support. Select this if you want Kodi to support HDMI CEC. comment "hdmi cec support needs udev /dev management and a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS || !BR2_PACKAGE_HAS_UDEV || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + depends on BR2_STATIC_LIBS || !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_KODI_LIRC bool "lirc" @@ -230,13 +233,6 @@ config BR2_PACKAGE_KODI_LIBVA comment "libva support needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS -config BR2_PACKAGE_KODI_WAVPACK - bool "wavpack" - select BR2_PACKAGE_WAVPACK - help - Enable WAV input support. - Select this if you want to play back WV files. - config BR2_PACKAGE_KODI_OPTICALDRIVE bool diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 14af9afd16..229446b1ad 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110 kodi-15.2-Isengard.tar.gz +sha256 0421ea1337cdee674f8a36d995f54152b5ddc4100e53410b3aeeb3b3f7d53946 kodi-16.0-Jarvis.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index ef3f1741c1..94a8cd8a62 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VERSION = 15.2-Isengard +KODI_VERSION = 16.0-Jarvis KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_LICENSE = GPLv2 KODI_LICENSE_FILES = LICENSE.GPL @@ -12,8 +12,8 @@ KODI_LICENSE_FILES = LICENSE.GPL KODI_INSTALL_STAGING = YES KODI_DEPENDENCIES = host-gawk host-gettext host-gperf host-zip host-giflib \ host-libjpeg host-lzo host-nasm host-libpng host-swig -KODI_DEPENDENCIES += boost bzip2 expat ffmpeg fontconfig freetype jasper jpeg \ - libass libcdio libcurl libfribidi libgcrypt libmpeg2 \ +KODI_DEPENDENCIES += boost bzip2 expat ffmpeg fontconfig freetype giflib jasper jpeg \ + libass libcdio libcrossguid libcurl libdcadec libfribidi libgcrypt libmpeg2 \ libogg libplist libpng libsamplerate libsquish libvorbis libxml2 \ libxslt lzo ncurses openssl pcre python readline sqlite taglib tiff \ tinyxml yajl zlib @@ -30,12 +30,9 @@ KODI_CONF_ENV = \ KODI_CONF_OPTS += \ --with-ffmpeg=shared \ - --disable-goom \ --disable-joystick \ --disable-openmax \ - --disable-projectm \ --disable-pulse \ - --disable-rsxs \ --disable-vdpau \ --disable-vtbdecoder \ --enable-optimizations @@ -178,10 +175,6 @@ else KODI_CONF_OPTS += --disable-lirc endif -ifeq ($(BR2_PACKAGE_KODI_WAVPACK),y) -KODI_DEPENDENCIES += wavpack -endif - ifeq ($(BR2_PACKAGE_KODI_LIBTHEORA),y) KODI_DEPENDENCIES += libtheora endif From 89a195e6c701b4e9ec9bfab5aaa352d87cb0e6be Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 23:09:12 +0100 Subject: [PATCH 197/206] package/kodi: enable samba support with uClibc toolchain Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 09bd0cd4ad..23468ccb29 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -191,12 +191,13 @@ config BR2_PACKAGE_KODI_LIBSHAIRPLAY comment "shairport support needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS -comment "samba support needs an (e)glibc toolchain w/ RPC" - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_NATIVE_RPC +comment "samba support needs a (e)glibc or uClibc toolchain w/ RPC" + depends on (!BR2_TOOLCHAIN_USES_GLIBC && \ + !BR2_TOOLCHAIN_USES_UCLIBC) || !BR2_TOOLCHAIN_HAS_NATIVE_RPC config BR2_PACKAGE_KODI_LIBSMBCLIENT bool "samba" - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC depends on BR2_TOOLCHAIN_HAS_SYNC_4 select BR2_PACKAGE_SAMBA4 From 898de0af5b511c9dfb40f00469fb518810668ec0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 23:09:13 +0100 Subject: [PATCH 198/206] package/kodi: not available using a musl-based toolchain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The build stops with configure: error: unsupported host (i586-buildroot-linux-musl) due to musl not being supported in https://github.com/xbmc/xbmc/blob/Isengard/m4/xbmc_arch.m4 Removing this obstacle will show that musl is really not being supported, the build will fail: In file included from emu_msvcrt.cpp:64:0: emu_msvcrt.h:93:3: error: ‘__off64_t’ does not name a type __off64_t dll_lseeki64(int fd, __off64_t lPos, int iWhence); ^ emu_msvcrt.h:94:3: error: ‘__off_t’ does not name a type __off_t dll_lseek(int fd, __off_t lPos, int iWhence); ^ I know these problems are fixable and the voidlinux projects seems to have done it already for 15.2-Isengard: https://github.com/voidlinux/void-packages/tree/99f74705bc6520297d689fae4bcc9606c71ad34f/srcpkgs/kodi/patches For Jarvis-16.0 these patches have to be rebased at a later stage. For now block the Kodi package with musl-based toolchains to avoid build errors. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 23468ccb29..13be622406 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -2,11 +2,12 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS bool default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) && BR2_PACKAGE_BOOST_ARCH_SUPPORTS -comment "kodi needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.7" +comment "kodi needs a uClibc or (e)glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.7" depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ + || BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_MMU config BR2_PACKAGE_KODI_EGL_GLES @@ -92,6 +93,7 @@ menuconfig BR2_PACKAGE_KODI depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL depends on BR2_USE_MMU # python depends on BR2_USE_WCHAR From c913784c986df8b191e3ea862a7b4595775e4cc6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 23:09:14 +0100 Subject: [PATCH 199/206] package/kodi: reorder select/depends >From [1]: "Even though the ordering has absolutely no consequences in Kconfig, it is not logical (when reading). It is more logical and far easier to understand when depends come first, followed by the selects." Also, the Config.in example in the manual suggests to use this coding style [2]. [1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html [2] http://buildroot.uclibc.org/downloads/manual/manual.html#writing-rules-config-in Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi/Config.in | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 13be622406..abd1dc1847 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -33,6 +33,15 @@ comment "kodi requires an OpenGL ES and EGL backend" menuconfig BR2_PACKAGE_KODI bool "kodi" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_USES_MUSL + depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL + depends on BR2_USE_MMU # python + depends on BR2_USE_WCHAR + depends on !BR2_STATIC_LIBS # python + depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS select BR2_NEEDS_HOST_JAVA select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_THREAD @@ -90,15 +99,6 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_YAJL select BR2_PACKAGE_ZLIB select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_USES_MUSL - depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL - depends on BR2_USE_MMU # python - depends on BR2_USE_WCHAR - depends on !BR2_STATIC_LIBS # python - depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS help Kodi is an award-winning free and open source (GPL) software media player and entertainment hub for digital media. @@ -132,8 +132,8 @@ config BR2_PACKAGE_KODI_DBUS config BR2_PACKAGE_KODI_LIBBLURAY bool "blu-ray" - select BR2_PACKAGE_LIBBLURAY depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBBLURAY help Enable Blu-ray input support. Select this if you want to play back Blu-ray content. @@ -228,8 +228,8 @@ config BR2_PACKAGE_KODI_LIBUSB config BR2_PACKAGE_KODI_LIBVA bool "va" - select BR2_PACKAGE_LIBVA depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBVA help Enable libva support. From a95fae661df69cb1f647513072e94e179d436d20 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 23:09:15 +0100 Subject: [PATCH 200/206] package/kodi: Remove dependency for BR2_STATIC_LIBS from sub packages Kodi itself already depends on !BR2_STATIC_LIBS, there is no need to duplicate this as reverse dependencies in sub options which depend on Kodi. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi/Config.in | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index abd1dc1847..13955e4d47 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -117,7 +117,6 @@ config BR2_PACKAGE_KODI_ALSA_LIB config BR2_PACKAGE_KODI_AVAHI bool "avahi" - depends on !BR2_STATIC_LIBS # avahi select BR2_PACKAGE_AVAHI select BR2_PACKAGE_AVAHI_DAEMON help @@ -132,26 +131,21 @@ config BR2_PACKAGE_KODI_DBUS config BR2_PACKAGE_KODI_LIBBLURAY bool "blu-ray" - depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBBLURAY help Enable Blu-ray input support. Select this if you want to play back Blu-ray content. -comment "libbluray support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - config BR2_PACKAGE_KODI_LIBCEC bool "hdmi cec" - depends on !BR2_STATIC_LIBS # libcec depends on BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_LIBCEC help Enable CEC (Consumer Electronics Control) support. Select this if you want Kodi to support HDMI CEC. -comment "hdmi cec support needs udev /dev management and a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS || !BR2_PACKAGE_HAS_UDEV +comment "hdmi cec support needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_KODI_LIRC bool "lirc" @@ -184,15 +178,11 @@ config BR2_PACKAGE_KODI_RTMPDUMP config BR2_PACKAGE_KODI_LIBSHAIRPLAY bool "shairport" - depends on !BR2_STATIC_LIBS # libshairplay -> avahi select BR2_PACKAGE_LIBSHAIRPLAY help Enable Shairport support. Select this if you want to stream content from an Apple device. -comment "shairport support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - comment "samba support needs a (e)glibc or uClibc toolchain w/ RPC" depends on (!BR2_TOOLCHAIN_USES_GLIBC && \ !BR2_TOOLCHAIN_USES_UCLIBC) || !BR2_TOOLCHAIN_HAS_NATIVE_RPC @@ -228,14 +218,10 @@ config BR2_PACKAGE_KODI_LIBUSB config BR2_PACKAGE_KODI_LIBVA bool "va" - depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBVA help Enable libva support. -comment "libva support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - config BR2_PACKAGE_KODI_OPTICALDRIVE bool From b1b1762d18f2f4a915acf614b75f563003b280e7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 23:09:16 +0100 Subject: [PATCH 201/206] package/kodi: Remove dependency for BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 from sub packages Kodi itself already depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7, there is no need to duplicate this as reverse dependencies in sub options which depend on Kodi. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-argustv/Config.in | 4 ---- package/kodi-pvr-filmon/Config.in | 4 ---- package/kodi-pvr-pctv/Config.in | 4 ---- package/kodi-pvr-stalker/Config.in | 4 ---- 4 files changed, 16 deletions(-) diff --git a/package/kodi-pvr-argustv/Config.in b/package/kodi-pvr-argustv/Config.in index 247d83ce17..216000aefd 100644 --- a/package/kodi-pvr-argustv/Config.in +++ b/package/kodi-pvr-argustv/Config.in @@ -1,12 +1,8 @@ config BR2_PACKAGE_KODI_PVR_ARGUSTV bool "kodi-pvr-argustv" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_KODI_PLATFORM help Kodi's ARGUS TV client addon https://github.com/kodi-pvr/pvr.argustv - -comment "kodi-pvr-argustv needs a toolchain w/ gcc >= 4.7" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/kodi-pvr-filmon/Config.in b/package/kodi-pvr-filmon/Config.in index 3d87ec82ed..0b662df176 100644 --- a/package/kodi-pvr-filmon/Config.in +++ b/package/kodi-pvr-filmon/Config.in @@ -1,12 +1,8 @@ config BR2_PACKAGE_KODI_PVR_FILMON bool "kodi-pvr-filmon" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_KODI_PLATFORM help Filmon PVR client addon for Kodi https://github.com/kodi-pvr/pvr.filmon - -comment "kodi-pvr-filmon needs a toolchain w/ gcc >= 4.7" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/kodi-pvr-pctv/Config.in b/package/kodi-pvr-pctv/Config.in index 1bef551b2e..255cd4a5f0 100644 --- a/package/kodi-pvr-pctv/Config.in +++ b/package/kodi-pvr-pctv/Config.in @@ -1,12 +1,8 @@ config BR2_PACKAGE_KODI_PVR_PCTV bool "kodi-pvr-pctv" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_KODI_PLATFORM help PCTV PVR client addon for Kodi https://github.com/kodi-pvr/pvr.vdr.vnsi - -comment "kodi-pvr-pctv needs a toolchain w/ gcc >= 4.7" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/kodi-pvr-stalker/Config.in b/package/kodi-pvr-stalker/Config.in index 26a8c3f1a2..3ec530cd39 100644 --- a/package/kodi-pvr-stalker/Config.in +++ b/package/kodi-pvr-stalker/Config.in @@ -1,12 +1,8 @@ config BR2_PACKAGE_KODI_PVR_STALKER bool "kodi-pvr-stalker" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_KODI_PLATFORM help A PVR Client that connects Kodi to Stalker Middleware https://github.com/kodi-pvr/pvr.stalker - -comment "kodi-pvr-stalker needs a toolchain w/ gcc >= 4.7" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 From 5be216b2c959c4a42336a42c1120e93f80dd4b25 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Feb 2016 23:09:17 +0100 Subject: [PATCH 202/206] package/ffmpeg: Remove patch not needed anymore for Kodi 16.0-Jarvis Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...ublic-version-of-ff_read_frame_flush.patch | 53 ------------------- 1 file changed, 53 deletions(-) delete mode 100644 package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch diff --git a/package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch b/package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch deleted file mode 100644 index 58a91e2e74..0000000000 --- a/package/ffmpeg/0013-add-public-version-of-ff_read_frame_flush.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7d7ce18ff0d24b586634fa6e631fa0eec7865aae Mon Sep 17 00:00:00 2001 -From: elupus -Date: Tue, 1 Nov 2011 20:18:35 +0100 -Subject: [PATCH 13/13] add public version of ff_read_frame_flush - -We need this since we sometimes seek on the -input stream behind ffmpeg's back. After this -all data need to be flushed completely. - -Patch part of the XBMC patch set for ffmpeg, downloaded from -https://github.com/xbmc/FFmpeg/. - -Signed-off-by: Bernd Kuhls ---- - libavformat/avformat.h | 5 +++++ - libavformat/utils.c | 5 +++++ - 2 files changed, 10 insertions(+) - -diff --git a/libavformat/avformat.h b/libavformat/avformat.h -index 2e54ed1..3a9f292 100644 ---- a/libavformat/avformat.h -+++ b/libavformat/avformat.h -@@ -2121,6 +2121,11 @@ int av_find_best_stream(AVFormatContext *ic, - int av_read_frame(AVFormatContext *s, AVPacket *pkt); - - /** -+ * Clear out any buffered data in context -+ */ -+void av_read_frame_flush(AVFormatContext *s); -+ -+/** - * Seek to the keyframe at timestamp. - * 'timestamp' in 'stream_index'. - * -diff --git a/libavformat/utils.c b/libavformat/utils.c -index f4fb172..10dda18 100644 ---- a/libavformat/utils.c -+++ b/libavformat/utils.c -@@ -1624,6 +1624,11 @@ void ff_read_frame_flush(AVFormatContext *s) - } - } - -+void av_read_frame_flush(AVFormatContext *s) -+{ -+ ff_read_frame_flush(s); -+} -+ - void ff_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp) - { - int i; --- -2.1.0 - From 310f73e4150149a4ce345a07c7cbcc076f899fec Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 1 Mar 2016 08:47:28 -0300 Subject: [PATCH 203/206] harfbuzz: bump to version 1.2.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/harfbuzz/harfbuzz.hash | 4 ++-- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index b7330fcba6..a6d5187285 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,2 +1,2 @@ -# From http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.2.0.tar.bz2.sha256 -sha256 79ff5305153d15931fbdda80c9612783b0283dee44f4c2af71aa37353daaa685 harfbuzz-1.2.0.tar.bz2 +# From http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.2.3.tar.bz2.sha256 +sha256 8216d2404aaab7fde87be0365a90d64aa6c55928e104557cfcb37b54a096cb8c harfbuzz-1.2.3.tar.bz2 diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 7cdc35699d..781c48ecac 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 1.2.0 +HARFBUZZ_VERSION = 1.2.3 HARFBUZZ_SITE = http://www.freedesktop.org/software/harfbuzz/release HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 3096fbd58b03fba24d2166a01db7fcaeccb420b6 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 29 Feb 2016 18:46:50 -0300 Subject: [PATCH 204/206] radvd: bump to version 2.12 musl build patch is upstream so it's no longer necessary. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/radvd/radvd.hash | 5 ++--- package/radvd/radvd.mk | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/radvd/radvd.hash b/package/radvd/radvd.hash index 3ace4fc654..ac6014b776 100644 --- a/package/radvd/radvd.hash +++ b/package/radvd/radvd.hash @@ -1,3 +1,2 @@ -# From http://www.litech.org/radvd/dist/radvd-2.11.tar.gz.sha256 -sha256 04636288fc79fa151260eeb2bea1b05942f59c31f01358c57f930a4eb45b5acc radvd-2.11.tar.xz -sha256 01d12bd2970fedf5695d9177a5ea45483d5e3c709ecceed636972c3049c47d0d 1d8973e13d89802eee0b648451e2b97ac65cf9e0.patch +# From http://www.litech.org/radvd/dist/radvd-2.12.tar.gz.sha256 +sha256 b070e77238e789e298a82cba2b1bfb0b0180b4ebc1adfc4e75058adfdbff747b radvd-2.12.tar.xz diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk index 503b62dfb8..8b6e5b2d01 100644 --- a/package/radvd/radvd.mk +++ b/package/radvd/radvd.mk @@ -4,14 +4,12 @@ # ################################################################################ -RADVD_VERSION = 2.11 +RADVD_VERSION = 2.12 RADVD_SOURCE = radvd-$(RADVD_VERSION).tar.xz RADVD_SITE = http://www.litech.org/radvd/dist -RADVD_PATCH = \ - https://github.com/reubenhwk/radvd/commit/1d8973e13d89802eee0b648451e2b97ac65cf9e0.patch RADVD_DEPENDENCIES = host-bison flex host-flex host-pkgconf RADVD_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -# We're patching configure.ac/Makefile.am. +# For 0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch RADVD_AUTORECONF = YES RADVD_LICENSE = BSD-4c-like RADVD_LICENSE_FILES = COPYRIGHT From 4eaa5a0e1b1da83a86d2f7dbb1bc55f151e40f1e Mon Sep 17 00:00:00 2001 From: Sergio Prado Date: Tue, 1 Mar 2016 07:58:55 -0300 Subject: [PATCH 205/206] mongodb: bump to version 3.3.2 Signed-off-by: Sergio Prado Signed-off-by: Peter Korsgaard --- package/mongodb/mongodb.hash | 2 +- package/mongodb/mongodb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mongodb/mongodb.hash b/package/mongodb/mongodb.hash index 0bdd66db93..e882d23b52 100644 --- a/package/mongodb/mongodb.hash +++ b/package/mongodb/mongodb.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 316496375f41f322839529d36e75e3275fdec468f7656fdbeb53ec8dc1ca5275 mongodb-r3.2.0.tar.gz +sha256 26fc05802dfc1e7d1f30e4ed418ba2bc7396b6fa5b298c18d6c9945dff2b8d08 mongodb-r3.3.2.tar.gz diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index 1027c83fac..6cc0b9e56b 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGODB_VERSION_BASE = 3.2.0 +MONGODB_VERSION_BASE = 3.3.2 MONGODB_VERSION = r$(MONGODB_VERSION_BASE) MONGODB_SITE = $(call github,mongodb,mongo,$(MONGODB_VERSION)) From 2dfabd10d1e484d84c0e6b5a58ab43d131ca3230 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Tue, 1 Mar 2016 21:56:07 -0500 Subject: [PATCH 206/206] avahi: move libdns_sd compat hook definition inside conditional block As directed in the buildroot manual, "Optional hooks: keep hook definition and assignment together in one if block". And also to be consistent with the rest of avahi.mk. Signed-off-by: Danomi Manchego Signed-off-by: Thomas Petazzoni --- package/avahi/avahi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index cad7acd302..8cf5f23210 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -216,13 +216,13 @@ define AVAHI_INSTALL_INIT_SYSV $(AVAHI_INSTALL_DAEMON_INIT_SYSV) endef +ifeq ($(BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY),y) # applications expects to be able to #include define AVAHI_STAGING_INSTALL_LIBDNSSD_LINK ln -sf avahi-compat-libdns_sd/dns_sd.h \ $(STAGING_DIR)/usr/include/dns_sd.h endef -ifeq ($(BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY),y) AVAHI_POST_INSTALL_STAGING_HOOKS += AVAHI_STAGING_INSTALL_LIBDNSSD_LINK endif