From 2f8a72079112bed85afff89c34b5a070a0fce015 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 9 Nov 2015 21:27:13 +0100 Subject: [PATCH 001/132] Kickoff 2016.02 cycle Signed-off-by: Thomas Petazzoni --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 80c264fc8b..9950a26cd0 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ else # umask all: # Set and export the version string -export BR2_VERSION := 2015.11-rc1 +export BR2_VERSION := 2016.02-git # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) From c06ecb2cef56d220d1f607eae24bdd9a4025af8e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 9 Nov 2015 08:18:56 -0300 Subject: [PATCH 002/132] usb_modeswitch: bump to version 2.2.6 Patch upstream so remove it. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- .../usb_modeswitch/0001-rename-abort.patch | 105 ------------------ package/usb_modeswitch/usb_modeswitch.hash | 2 +- package/usb_modeswitch/usb_modeswitch.mk | 2 +- 3 files changed, 2 insertions(+), 107 deletions(-) delete mode 100644 package/usb_modeswitch/0001-rename-abort.patch diff --git a/package/usb_modeswitch/0001-rename-abort.patch b/package/usb_modeswitch/0001-rename-abort.patch deleted file mode 100644 index 739e817c63..0000000000 --- a/package/usb_modeswitch/0001-rename-abort.patch +++ /dev/null @@ -1,105 +0,0 @@ -abort() is a C library function and used by Jim, so it results in -a duplicate definition and confusion when linking statically. - -Signed-off-by: Gustavo Zacarias - -diff -Nura usb-modeswitch-2.2.5.orig/usb_modeswitch.c usb-modeswitch-2.2.5/usb_modeswitch.c ---- usb-modeswitch-2.2.5.orig/usb_modeswitch.c 2015-07-28 08:24:41.043352748 -0300 -+++ usb-modeswitch-2.2.5/usb_modeswitch.c 2015-07-28 08:38:43.557315576 -0300 -@@ -544,7 +544,7 @@ - libusb_open(dev, &devh); - if (devh == NULL) { - SHOW_PROGRESS(output,"Error opening the device. Abort\n\n"); -- abort(); -+ abortOut(); - } - } - -@@ -574,18 +574,18 @@ - ResponseEndpoint = find_first_bulk_endpoint(LIBUSB_ENDPOINT_IN); - if (!MessageEndpoint) { - fprintf(stderr,"Error: message endpoint not given or found. Abort\n\n"); -- abort(); -+ abortOut(); - } - if (!ResponseEndpoint) { - fprintf(stderr,"Error: response endpoint not given or found. Abort\n\n"); -- abort(); -+ abortOut(); - } - SHOW_PROGRESS(output,"Use endpoints 0x%02x (out) and 0x%02x (in)\n", MessageEndpoint, ResponseEndpoint); - } - - if (interfaceClass == -1) { - fprintf(stderr, "Error: Could not get class of interface %d. Does it exist? Abort\n\n",Interface); -- abort(); -+ abortOut(); - } - - if (defaultClass == 0) -@@ -601,7 +601,7 @@ - if (defaultClass != 8) { - fprintf(stderr, "Error: can't use storage command in MessageContent with interface %d;\n" - " interface class is %d, expected 8. Abort\n\n", Interface, defaultClass); -- abort(); -+ abortOut(); - } - - if (InquireDevice && show_progress) { -@@ -629,7 +629,7 @@ - */ - if ( ModeMap & (ModeMap-1) ) { - fprintf(output,"Multiple special modes selected; check configuration. Abort\n\n"); -- abort(); -+ abortOut(); - } - - if ((strlen(MessageContent) || StandardEject) && ModeMap ) { -@@ -1339,7 +1339,7 @@ - ret = libusb_claim_interface(devh, Interface); - if (ret < 0) { - SHOW_PROGRESS(output," Could not claim interface (error %d). Abort\n", ret); -- abort(); -+ abortOut(); - } - // libusb_clear_halt(devh, MessageEndpoint); - if (show_progress) -@@ -1832,7 +1832,7 @@ - int ret = libusb_get_active_config_descriptor(dev, &active_config); - if (ret < 0) { - SHOW_PROGRESS(output," Determining the active configuration failed (error %d). Abort\n", ret); -- abort(); -+ abortOut(); - } - return active_config->bConfigurationValue; - } -@@ -1878,7 +1878,7 @@ - } - if (file==NULL) { - fprintf(stderr, "Error: Could not find file %s. Abort\n\n", FileName); -- abort(); -+ abortOut(); - } else { - token = fgets(Str, LINE_DIM-1, file); - } -@@ -2014,7 +2014,7 @@ - closelog(); - } - --void abort() -+void abortOut() - { - close_all(); - exit(1); -diff -Nura usb-modeswitch-2.2.5.orig/usb_modeswitch.h usb-modeswitch-2.2.5/usb_modeswitch.h ---- usb-modeswitch-2.2.5.orig/usb_modeswitch.h 2015-07-28 08:24:41.043352748 -0300 -+++ usb-modeswitch-2.2.5/usb_modeswitch.h 2015-07-28 08:38:54.986708480 -0300 -@@ -61,7 +61,7 @@ - void printVersion(); - void printHelp(); - void close_all(); --void abort(); -+void abortOut(); - int readArguments(int argc, char **argv); - void deviceDescription(); - int deviceInquire(); diff --git a/package/usb_modeswitch/usb_modeswitch.hash b/package/usb_modeswitch/usb_modeswitch.hash index 9552a24dab..2033d31104 100644 --- a/package/usb_modeswitch/usb_modeswitch.hash +++ b/package/usb_modeswitch/usb_modeswitch.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8b2340303732aabc8c8e1cdd7d4352f61dcb942839f58ce22ba0ecfa122426d5 usb-modeswitch-2.2.5.tar.bz2 +sha256 7ee42be2fe26dde20c58f54bf678fb136d2706250e4aa74f06fc97268a46e90f usb-modeswitch-2.2.6.tar.bz2 diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk index c1b0a76428..aca13e4f90 100644 --- a/package/usb_modeswitch/usb_modeswitch.mk +++ b/package/usb_modeswitch/usb_modeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -USB_MODESWITCH_VERSION = 2.2.5 +USB_MODESWITCH_VERSION = 2.2.6 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DEPENDENCIES = libusb From a916e915a3567adacb92841e80f2266999379607 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 9 Nov 2015 08:18:57 -0300 Subject: [PATCH 003/132] usb_modeswitch_data: bump to version 20151101 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- 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 ea36839cdd..05a544528e 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 826096cb35a487c6e924b1318074988457220b5e72812e5393597950dd9eefc2 usb-modeswitch-data-20150627.tar.bz2 +sha256 584d362bc0060c02016edaac7b05ebd6558d5dcbdf14f1ae6d0ec9630265a982 usb-modeswitch-data-20151101.tar.bz2 diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.mk b/package/usb_modeswitch_data/usb_modeswitch_data.mk index 1b397cb5ec..d8d5622395 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 = 20150627 +USB_MODESWITCH_DATA_VERSION = 20151101 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 334bae4bd85f20cee927c05a70dfa08aab2453b9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 7 Nov 2015 11:34:17 +0100 Subject: [PATCH 004/132] package/tvheadend: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tvheadend/tvheadend.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 4ffb357a5e..6b8fdea126 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = 1b682a46a11ea821c4ed183a274bc78993ef40a0 +TVHEADEND_VERSION = a27b0af2b82dae83cf8a41e01ee1174b911f3aa3 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPLv3+ TVHEADEND_LICENSE_FILES = LICENSE.md From 18566c37dc226fb22fee3a069afaf70a97e656b8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 10 Nov 2015 09:46:35 -0300 Subject: [PATCH 005/132] ipset: bump to version 6.27 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/ipset/ipset.hash | 6 +++--- package/ipset/ipset.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ipset/ipset.hash b/package/ipset/ipset.hash index e0f11d9c71..844bebba8c 100644 --- a/package/ipset/ipset.hash +++ b/package/ipset/ipset.hash @@ -1,4 +1,4 @@ -# From ftp://ftp.netfilter.org/pub/ipset/ipset-6.25.1.tar.bz2.md5sum.txt -md5 e58262af2d53bda271f43883eebc8d54 ipset-6.25.1.tar.bz2 +# From ftp://ftp.netfilter.org/pub/ipset/ipset-6.27.tar.bz2.md5sum.txt +md5 c39f8958908b1396e2c69f082b75d924 ipset-6.27.tar.bz2 # Calculated based on the hash above -sha256 658e15d0d0d6a7160137ef1c2bc2c8669cfee996eb9e049df8d7313e34795e7b ipset-6.25.1.tar.bz2 +sha256 724897a80395534466142c3542184e5a480a5046140ca2a7d9097690b931b235 ipset-6.27.tar.bz2 diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk index e5e9218e43..fff67e2746 100644 --- a/package/ipset/ipset.mk +++ b/package/ipset/ipset.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPSET_VERSION = 6.25.1 +IPSET_VERSION = 6.27 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org IPSET_DEPENDENCIES = libmnl host-pkgconf From 9d3855012c9ff5769451175fa47abeca908e40a9 Mon Sep 17 00:00:00 2001 From: Joris Lijssens Date: Mon, 9 Nov 2015 10:03:31 +0100 Subject: [PATCH 006/132] libnet: new package [Thomas: add hash file.] Signed-off-by: Joris Lijssens Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/libnet/Config.in | 7 +++++++ package/libnet/libnet.hash | 3 +++ package/libnet/libnet.mk | 13 +++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 package/libnet/Config.in create mode 100644 package/libnet/libnet.hash create mode 100644 package/libnet/libnet.mk diff --git a/package/Config.in b/package/Config.in index bdc3063abd..e0b42c0f3e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1019,6 +1019,7 @@ menu "Networking" source "package/libmnl/Config.in" source "package/libmodbus/Config.in" source "package/libndp/Config.in" + source "package/libnet/Config.in" source "package/libnetfilter_acct/Config.in" source "package/libnetfilter_conntrack/Config.in" source "package/libnetfilter_cthelper/Config.in" diff --git a/package/libnet/Config.in b/package/libnet/Config.in new file mode 100644 index 0000000000..7186972b7e --- /dev/null +++ b/package/libnet/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBNET + bool "libnet" + help + libnet provides a portable framework for low-level network + packet construction. + + http://sourceforge.net/projects/libnet-dev diff --git a/package/libnet/libnet.hash b/package/libnet/libnet.hash new file mode 100644 index 0000000000..dd3349082d --- /dev/null +++ b/package/libnet/libnet.hash @@ -0,0 +1,3 @@ +# From https://sourceforge.net/projects/libnet-dev/files/ +sha1 dffff71c325584fdcf99b80567b60f8ad985e34c libnet-1.1.6.tar.gz +md5 710296fe424a49344e5fcc0d09e53317 libnet-1.1.6.tar.gz diff --git a/package/libnet/libnet.mk b/package/libnet/libnet.mk new file mode 100644 index 0000000000..d021f7663d --- /dev/null +++ b/package/libnet/libnet.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# libnet +# +################################################################################ + +LIBNET_VERSION = 1.1.6 +LIBNET_SITE = http://sourceforge.net/projects/libnet-dev/files +LIBNET_INSTALL_STAGING = YES +LIBNET_LICENSE = BSD-2c +LIBNET_LICENSE_FILES = doc/COPYING + +$(eval $(autotools-package)) From 500d287b07190c9c1a1284bc91b37d07e1a835a3 Mon Sep 17 00:00:00 2001 From: Joris Lijssens Date: Mon, 9 Nov 2015 10:03:32 +0100 Subject: [PATCH 007/132] netsniff-ng: new package [Thomas: - add comment in Config.in to explain why this package depends on glibc, and specifically why it doesn't build for uClibc and musl. - add hash file. - add 'COPYING' to the list of LICENSE_FILES - add themissing _DEPENDENCIES variable in the .mk file, to make sure dependencies are built before netsniff-ng. - add comment in the .mk file explain why we're using the generic-package infrastructure even if the build procedure is essentially ./configure, make, make install. - fix indentation in NETSNIFF_NG_CONFIGURE_CMDS.] Signed-off-by: Joris Lijssens Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/netsniff-ng/Config.in | 24 ++++++++++++++++++++ package/netsniff-ng/netsniff-ng.hash | 2 ++ package/netsniff-ng/netsniff-ng.mk | 34 ++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+) create mode 100644 package/netsniff-ng/Config.in create mode 100644 package/netsniff-ng/netsniff-ng.hash create mode 100644 package/netsniff-ng/netsniff-ng.mk diff --git a/package/Config.in b/package/Config.in index e0b42c0f3e..0a80afb468 100644 --- a/package/Config.in +++ b/package/Config.in @@ -88,6 +88,7 @@ endif source "package/mcelog/Config.in" source "package/memstat/Config.in" source "package/netperf/Config.in" + source "package/netsniff-ng/Config.in" source "package/oprofile/Config.in" source "package/pax-utils/Config.in" source "package/pv/Config.in" diff --git a/package/netsniff-ng/Config.in b/package/netsniff-ng/Config.in new file mode 100644 index 0000000000..8c48f3962b --- /dev/null +++ b/package/netsniff-ng/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_NETSNIFF_NG + bool "netsniff-ng" + select BR2_PACKAGE_LIBNL + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_LIBCLI + select BR2_PACKAGE_LIBNETFILTER_CONNTRACK + select BR2_PACKAGE_LIBURCU + select BR2_PACKAGE_LIBNET + # Build with uClibc fails due to missing ceill() + # Build with musl fails due to various header issues + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58854 # liburcu + help + netsniff-ng is a free, performant Linux network analyzer and + networking toolkit. If you will, the Swiss army knife for + network packets. + +comment "netsniff-ng needs an (e)glibc toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58854 + +comment "netsniff-ng needs a toolchain not affected by GCC bug 58854" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_58854 diff --git a/package/netsniff-ng/netsniff-ng.hash b/package/netsniff-ng/netsniff-ng.hash new file mode 100644 index 0000000000..935003cf83 --- /dev/null +++ b/package/netsniff-ng/netsniff-ng.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f0008edd31df93822b7befe50cfb3740ce6fd35b1013ae3a73b2a389a41022e4 netsniff-ng-v0.5.9.tar.gz diff --git a/package/netsniff-ng/netsniff-ng.mk b/package/netsniff-ng/netsniff-ng.mk new file mode 100644 index 0000000000..4fed88ce37 --- /dev/null +++ b/package/netsniff-ng/netsniff-ng.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# netsniff-ng +# +################################################################################ + +NETSNIFF_NG_VERSION = v0.5.9 +NETSNIFF_NG_SITE = $(call github,netsniff-ng,netsniff-ng,$(NETSNIFF_NG_VERSION)) +NETSNIFF_NG_LICENSE = GPLv2 +NETSNIFF_NG_LICENSE_FILES = README COPYING +NETSNIFF_NG_DEPENDENCIES = \ + libnl libpcap libcli libnetfilter_conntrack \ + liburcu libnet + +# hand-written configure script and makefile +define NETSNIFF_NG_CONFIGURE_CMDS + (cd $(@D); \ + $(TARGET_CONFIGURE_ARGS) \ + $(TARGET_CONFIGURE_OPTS) \ + ./configure \ + --prefix=$(TARGET_DIR)/usr \ + ) +endef + +define NETSNIFF_NG_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef + +define NETSNIFF_NG_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + PREFIX=$(TARGET_DIR)/usr ETCDIR=$(TARGET_DIR)/etc install -C $(@D) +endef + +$(eval $(generic-package)) From 6d33e77f742cc5f9706a6eb4eaeeaabe27315939 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 11 Nov 2015 15:02:24 +0100 Subject: [PATCH 008/132] libnet: adjust license information As noticed by Arnout, some files are under BSD-3c. Signed-off-by: Thomas Petazzoni --- package/libnet/libnet.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libnet/libnet.mk b/package/libnet/libnet.mk index d021f7663d..3b62a793b3 100644 --- a/package/libnet/libnet.mk +++ b/package/libnet/libnet.mk @@ -7,7 +7,7 @@ LIBNET_VERSION = 1.1.6 LIBNET_SITE = http://sourceforge.net/projects/libnet-dev/files LIBNET_INSTALL_STAGING = YES -LIBNET_LICENSE = BSD-2c +LIBNET_LICENSE = BSD-2c, BSD-3c LIBNET_LICENSE_FILES = doc/COPYING $(eval $(autotools-package)) From f98e865074a6c6f9cc38721b3320f95de5f2967b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 10 Nov 2015 21:47:24 -0300 Subject: [PATCH 009/132] alsa-lib: bump to version 1.1.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- .../alsa-lib/0001-add-missing-include.patch | 29 +++++++++++++++++++ package/alsa-lib/alsa-lib.hash | 2 +- package/alsa-lib/alsa-lib.mk | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 package/alsa-lib/0001-add-missing-include.patch diff --git a/package/alsa-lib/0001-add-missing-include.patch b/package/alsa-lib/0001-add-missing-include.patch new file mode 100644 index 0000000000..ac7dfa95c5 --- /dev/null +++ b/package/alsa-lib/0001-add-missing-include.patch @@ -0,0 +1,29 @@ +Subject: [PATCH] topology: Add missing include sys/stat.h + +Necessary for proper definitions of S_IRUSR & co. Otherwise it +results in compile errors with old glibc: + parser.c: In function 'snd_tplg_build_file': + parser.c:262: error: 'S_IRUSR' undeclared (first use in this function) + parser.c:262: error: (Each undeclared identifier is reported only once + parser.c:262: error: for each function it appears in.) + +Signed-off-by: Takashi Iwai +Signed-off-by: Gustavo Zacarias +--- +Status: upstream + +diff --git a/src/topology/parser.c b/src/topology/parser.c +index 80a0ae0..18bb9c7 100644 +--- a/src/topology/parser.c ++++ b/src/topology/parser.c +@@ -16,6 +16,7 @@ + Liam Girdwood + */ + ++#include + #include "list.h" + #include "tplg_local.h" + +-- +1.7.11.7 + diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index 3e132c82d8..506416d2af 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 73043c35eb9636be0f4af6a240235c213f12a25feb1f04aeeac8cb7e30fcbdd0 alsa-lib-1.0.29.tar.bz2 +sha256 dfde65d11e82b68f82e562ab6228c1fb7c78854345d3c57e2c68a9dd3dae1f15 alsa-lib-1.1.0.tar.bz2 diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 3115433b56..ea2351c93a 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.0.29 +ALSA_LIB_VERSION = 1.1.0 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib ALSA_LIB_LICENSE = LGPLv2.1+ From c835db65fa9084690ce244a5401d5943d98274c5 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 10 Nov 2015 21:47:25 -0300 Subject: [PATCH 010/132] alsa-utils: bump to version 1.1.0 Also add BAT (Basic Audio Testing) tool option. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/alsa-utils/Config.in | 4 ++++ package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 10 +++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in index 3a99279276..a08743edbf 100644 --- a/package/alsa-utils/Config.in +++ b/package/alsa-utils/Config.in @@ -50,6 +50,10 @@ config BR2_PACKAGE_ALSA_UTILS_APLAY select BR2_PACKAGE_ALSA_LIB_PCM bool "aplay/arecord" +config BR2_PACKAGE_ALSA_UTILS_BAT + select BR2_PACKAGE_FFTW + bool "bat" + config BR2_PACKAGE_ALSA_UTILS_IECSET select BR2_PACKAGE_ALSA_LIB_PCM bool "iecset" diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index ba5061b129..e6530ebd05 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5160058f3e14483ced5de919dd473f93932059454530a9b7ef97dcabd6833e9b alsa-utils-1.0.29.tar.bz2 +sha256 3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1 alsa-utils-1.1.0.tar.bz2 diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 06bda9a09f..11b46c44eb 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.0.29 +ALSA_UTILS_VERSION = 1.1.0 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils ALSA_UTILS_LICENSE = GPLv2 @@ -33,12 +33,20 @@ ifneq ($(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER),y) ALSA_UTILS_CONF_OPTS += --disable-alsamixer --disable-alsatest endif +ifeq ($(BR2_PACKAGE_ALSA_UTILS_BAT),y) +ALSA_UTILS_CONF_OPTS += --enable-bat +ALSA_UTILS_DEPENDENCIES += fftw +else +ALSA_UTILS_CONF_OPTS += --disable-bat +endif + ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACONF) += usr/sbin/alsaconf ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACTL) += usr/sbin/alsactl ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER) += usr/bin/alsamixer ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_AMIDI) += usr/bin/amidi ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_AMIXER) += usr/bin/amixer ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_APLAY) += usr/bin/aplay usr/bin/arecord +ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_BAT) += usr/bin/bat ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_IECSET) += usr/bin/iecset ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ACONNECT) += usr/bin/aconnect ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSAUCM) += usr/bin/alsaucm From ae326e335141b7ea9bc85eea07f99d4b900a6259 Mon Sep 17 00:00:00 2001 From: Andrew Donnellan Date: Wed, 11 Nov 2015 14:46:14 +1100 Subject: [PATCH 011/132] trinity: bump to version 1.6 Bump trinity version to 1.6. Remove backported vt.c missing include patch as it is now included in the upstream release. Signed-off-by: Andrew Donnellan Signed-off-by: Thomas Petazzoni --- ...-include-to-fix-building-with-uClibc.patch | 47 ------------------- package/trinity/trinity.mk | 2 +- 2 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 package/trinity/0001-vt.c-add-missing-include-to-fix-building-with-uClibc.patch diff --git a/package/trinity/0001-vt.c-add-missing-include-to-fix-building-with-uClibc.patch b/package/trinity/0001-vt.c-add-missing-include-to-fix-building-with-uClibc.patch deleted file mode 100644 index e1d23cd600..0000000000 --- a/package/trinity/0001-vt.c-add-missing-include-to-fix-building-with-uClibc.patch +++ /dev/null @@ -1,47 +0,0 @@ -vt.c: add missing include to fix building with uClibc - -Backporting an upstream patch to fix a building issue with uClibc. - -Upstream commit: - - https://github.com/kernelslacker/trinity/commit/fb4a1adc4540f0702b84aa900f2b8ebed004885d - -Signed-off-by: Vicente Olivert Riera - -From fb4a1adc4540f0702b84aa900f2b8ebed004885d Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Wed, 18 Mar 2015 09:58:46 +0000 -Subject: [PATCH] vt.c: add missing include to fix building with uClibc - -"#include " is needed in order to build trinity -successfully with uClibc. Otherwise it would fail displaying an error -message like this one: - -ioctls/vt.c:152:8: error: invalid application of 'sizeof' to incomplete -type 'struct serial_rs485' - IOCTL(TIOCGRS485), - -ioctls/vt.c:155:8: error: invalid application of 'sizeof' to incomplete -type 'struct serial_rs485' - IOCTL(TIOCSRS485), - -Signed-off-by: Vicente Olivert Riera ---- - ioctls/vt.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/ioctls/vt.c b/ioctls/vt.c -index 5e7e7d7..a4a7e0c 100644 ---- a/ioctls/vt.c -+++ b/ioctls/vt.c -@@ -1,6 +1,7 @@ - #include - #include - #include -+#include - - #include "utils.h" - #include "ioctls.h" --- -1.7.1 - diff --git a/package/trinity/trinity.mk b/package/trinity/trinity.mk index 211f1b6169..7596e92ba8 100644 --- a/package/trinity/trinity.mk +++ b/package/trinity/trinity.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRINITY_VERSION = v1.5 +TRINITY_VERSION = v1.6 TRINITY_SITE = $(call github,kernelslacker,trinity,$(TRINITY_VERSION)) TRINITY_LICENSE = GPLv2 TRINITY_LICENSE_FILES = COPYING From 68d351b6f3165895294e566f0b39319a3fd3ab6a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 11 Nov 2015 10:28:19 -0300 Subject: [PATCH 012/132] rrdtool: bump to version 1.5.5 Drop the patches since this is a major bump and they're no longer relevant. Introduce the new RRDTOOL_RRDGRAPH option, in previous versions the graphing functionality was bundled with the stats/database backend, however for newer versions this can be disabled. Since it's normally expected functionality the default is yes, however all of the buildroot rrd-using applications can work without this. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/rrdtool/0001-automake-compat.patch | 18 ---------- ...configure-dont-hardcode-include-dirs.patch | 26 -------------- package/rrdtool/Config.in | 36 +++++++++++++++---- package/rrdtool/rrdtool.hash | 2 +- package/rrdtool/rrdtool.mk | 36 ++++++++++--------- 5 files changed, 49 insertions(+), 69 deletions(-) delete mode 100644 package/rrdtool/0001-automake-compat.patch delete mode 100644 package/rrdtool/0002-configure-dont-hardcode-include-dirs.patch diff --git a/package/rrdtool/0001-automake-compat.patch b/package/rrdtool/0001-automake-compat.patch deleted file mode 100644 index 92b753db23..0000000000 --- a/package/rrdtool/0001-automake-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Make it compatible with newer autoconf/automake. -Patch from OpenWRT. - -Signed-off-by: Gustavo Zacarias - ---- a/bindings/tcl/Makefile.am -+++ b/bindings/tcl/Makefile.am -@@ -26,8 +26,8 @@ tclpkgdir = @TCL_PACKAGE_DIR@ - tclpkg_DATA = pkgIndex.tcl - tclpkg_SCRIPTS = ifOctets.tcl - else --pkglib_DATA = pkgIndex.tcl --pkglib_SCRIPTS = ifOctets.tcl -+pkgdata_DATA = pkgIndex.tcl -+pkgdata_SCRIPTS = ifOctets.tcl - endif - - # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as diff --git a/package/rrdtool/0002-configure-dont-hardcode-include-dirs.patch b/package/rrdtool/0002-configure-dont-hardcode-include-dirs.patch deleted file mode 100644 index 43b57a1b22..0000000000 --- a/package/rrdtool/0002-configure-dont-hardcode-include-dirs.patch +++ /dev/null @@ -1,26 +0,0 @@ -[PATCH] configure.ac: don't hardcode include files search paths - -Breaks cross compilation if host has libart/freetype. - -Signed-off-by: Peter Korsgaard ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: rrdtool-1.2.30/configure.ac -=================================================================== ---- rrdtool-1.2.30.orig/configure.ac -+++ rrdtool-1.2.30/configure.ac -@@ -524,10 +524,10 @@ - - CORE_LIBS="$LIBS" - --EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point, libart_lgpl/libart.h, libart-2.0, 2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, /usr/include/libart-2.0) -+EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point, libart_lgpl/libart.h, libart-2.0, 2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, "") - EX_CHECK_ALL(z, zlibVersion, zlib.h, zlib, 1.2.3, http://www.gzip.org/zlib/, "") - EX_CHECK_ALL(png, png_access_version_number, png.h, libpng, 1.2.10, http://prdownloads.sourceforge.net/libpng/, "") --EX_CHECK_ALL(freetype, FT_Init_FreeType, ft2build.h, freetype2, 2.1.10, http://prdownloads.sourceforge.net/freetype/, /usr/include/freetype2) -+EX_CHECK_ALL(freetype, FT_Init_FreeType, ft2build.h, freetype2, 2.1.10, http://prdownloads.sourceforge.net/freetype/, "") - - if test "$EX_CHECK_ALL_ERR" = "YES"; then - AC_MSG_ERROR([Please fix the library issues listed above and try again.]) diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in index 33fa677745..b07c446cd9 100644 --- a/package/rrdtool/Config.in +++ b/package/rrdtool/Config.in @@ -1,15 +1,37 @@ config BR2_PACKAGE_RRDTOOL bool "rrdtool" - depends on BR2_USE_WCHAR - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_LIBART - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_ZLIB + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + select BR2_PACKAGE_LIBGLIB2 help RRDtool is the OpenSource industry standard, high performance data logging and graphing system for time series data. http://oss.oetiker.ch/rrdtool/ -comment "rrdtool needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR +if BR2_PACKAGE_RRDTOOL + +config BR2_PACKAGE_RRDTOOL_RRDGRAPH + bool "rrd_graph" + default y + depends on BR2_ARCH_HAS_ATOMICS # cairo + depends on BR2_INSTALL_LIBSTDCPP # freetype support from pango + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_CAIRO_PDF + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_PS + select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_PANGO + help + This enables the graphing capabilities ('rrdgraph'). + Without this it will only act as a database backend. + +comment "rrd_graph support needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + +endif + +comment "rrdtool needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/rrdtool/rrdtool.hash b/package/rrdtool/rrdtool.hash index 20af75a04c..36ac50c9de 100644 --- a/package/rrdtool/rrdtool.hash +++ b/package/rrdtool/rrdtool.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 3190efea410a6dd035799717948b2df09910f608d72d23ee81adad4cd0184ae9 rrdtool-1.2.30.tar.gz +sha256 3a286d449c05d657e3fc3adcaa5cb4f0cfac8f465324b14f364a45d4ff8ca6f6 rrdtool-1.5.5.tar.gz diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk index e4226946ff..bc2fa898f6 100644 --- a/package/rrdtool/rrdtool.mk +++ b/package/rrdtool/rrdtool.mk @@ -4,31 +4,33 @@ # ################################################################################ -RRDTOOL_VERSION = 1.2.30 +RRDTOOL_VERSION = 1.5.5 RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub RRDTOOL_LICENSE = GPLv2+ with FLOSS license exceptions as explained in COPYRIGHT -RRDTOOL_LICENSE_FILES = COPYING COPYRIGHT - -RRDTOOL_DEPENDENCIES = host-pkgconf freetype libart libpng zlib -RRDTOOL_AUTORECONF = YES +RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE +RRDTOOL_DEPENDENCIES = host-pkgconf libglib2 RRDTOOL_INSTALL_STAGING = YES -RRDTOOL_CONF_ENV = \ - rd_cv_ieee_works=yes \ - rd_cv_null_realloc=nope \ - ac_cv_func_mmap_fixed_mapped=yes RRDTOOL_CONF_OPTS = \ + --disable-examples \ + --disable-libdbi \ + --disable-librados \ + --disable-libwrap \ + --disable-lua \ --disable-perl \ --disable-python \ --disable-ruby \ - --disable-tcl \ - --program-transform-name='' \ - $(if $(BR2_TOOLCHAIN_HAS_THREADS),,--disable-pthread) -RRDTOOL_MAKE = $(MAKE1) + --disable-tcl -define RRDTOOL_REMOVE_EXAMPLES - rm -rf $(TARGET_DIR)/usr/share/rrdtool/examples -endef +ifeq ($(BR2_PACKAGE_RRDTOOL_RRDGRAPH),y) +RRDTOOL_DEPENDENCIES += cairo pango +else +RRDTOOL_CONF_OPTS += --disable-rrd_graph +endif -RRDTOOL_POST_INSTALL_TARGET_HOOKS += RRDTOOL_REMOVE_EXAMPLES +ifeq ($(BR2_PACKAGE_LIBXML2),y) +RRDTOOL_DEPENDENCIES += libxml2 +else +RRDTOOL_CONF_OPTS += --disable-rrd_restore +endif $(eval $(autotools-package)) From 2db62b3164b6b14a7a83baecc51c355def70bdd8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 11 Nov 2015 10:29:20 -0300 Subject: [PATCH 013/132] gvfs: bump to version 1.26.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- 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 cc9e4f6403..19e820a506 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.1.1.sha256sum -sha256 2dadf986e464db1d7f007b178a5432b30ba93ef0cb31a2795156540d496dc06d gvfs-1.26.1.1.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.26/gvfs-1.26.2.sha256sum +sha256 695b6e0f3de5ac2cb4d188917edef3f13299328150a2413f1a7131d9b2d48d18 gvfs-1.26.2.tar.xz diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index e1da18fb51..48d2b506c0 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).1.1 +GVFS_VERSION = $(GVFS_VERSION_MAJOR).2 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 739d2b41b99a1dc2a44c49cee2fa99efa7c613a3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 11 Nov 2015 10:33:52 -0300 Subject: [PATCH 014/132] libglib2: bump to version 2.46.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 6032c309c4..7bce911fe2 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,2 +1,2 @@ -# https://download.gnome.org/sources/glib/2.46/glib-2.46.1.sha256sum -sha256 5a1f03b952ebc3a7e9f612b8724f70898183e31503db329b4f15d07163c8fdfb glib-2.46.1.tar.xz +# https://download.gnome.org/sources/glib/2.46/glib-2.46.2.sha256sum +sha256 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db glib-2.46.2.tar.xz diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 8f6ca8361c..c3c9cf8301 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.46 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPLv2+ From beec4437a06a570c41050c0abc2865110b54f828 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 11 Nov 2015 10:34:29 -0300 Subject: [PATCH 015/132] libsoup: bump to version 2.52.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libsoup/libsoup.hash | 4 ++-- package/libsoup/libsoup.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash index 58e3eb26c9..7878550894 100644 --- a/package/libsoup/libsoup.hash +++ b/package/libsoup/libsoup.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsoup/2.52/libsoup-2.52.1.sha256sum -sha256 0e19bca047ad50b28e8ed7663840f9e45a94909148822ca44dcb3e8cafb5cc48 libsoup-2.52.1.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libsoup/2.52/libsoup-2.52.2.sha256sum +sha256 db55628b5c7d952945bb71b236469057c8dfb8dea0c271513579c6273c2093dc libsoup-2.52.2.tar.xz diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index e43e25cd88..fd51a0e7f8 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSOUP_VERSION_MAJOR = 2.52 -LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).1 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).2 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPLv2+ From d977440126e09d4eb0feafc8f9682a06341bfd1a Mon Sep 17 00:00:00 2001 From: Fabio Porcedda Date: Thu, 12 Nov 2015 09:05:41 +0100 Subject: [PATCH 016/132] barebox: bump to version 2015.11.0 Signed-off-by: Fabio Porcedda Signed-off-by: Peter Korsgaard --- 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 7e8118152b..e9021fbe21 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 "2015.10.0" + bool "2015.11.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2015.10.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2015.11.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 1b927baf9a..bb2ecc2396 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,5 +1,5 @@ -# http://www.barebox.org/download/barebox-2015.10.0.tar.bz2.md5 -md5 50b787db3f91bebd5ed646e80a05caab barebox-2015.10.0.tar.bz2 +# http://www.barebox.org/download/barebox-2015.11.0.tar.bz2.md5 +md5 05951fa64000f5baedfc1064dbcfcad0 barebox-2015.11.0.tar.bz2 # Locally calculated -sha256 8353042fe27a30a01a00fe1e1f4a34f292a291027b9637d3ea8f305387407880 barebox-2015.10.0.tar.bz2 +sha256 ea40cef0a5ef76c4d68e76ac0e5c71c758c563ffa48c08e0b284688ec6f9d422 barebox-2015.11.0.tar.bz2 From 1cb8db0b2d3f561ca7aba7b945118c525bfc9cb3 Mon Sep 17 00:00:00 2001 From: Alex Suykov Date: Mon, 9 Nov 2015 00:52:08 +0200 Subject: [PATCH 017/132] linux-firmware: menu entries for mwifiex blobs Firmware blobs for Marvell WiFi-Ex 8797, 8887, 8897 were already there in linux-firmware tree but relevant options were not in Config.in. Signed-off-by: Alex Suykov Signed-off-by: Peter Korsgaard --- package/linux-firmware/Config.in | 30 ++++++++++++++++++++ package/linux-firmware/linux-firmware.mk | 36 ++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 2e4c205937..32e9c6e376 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -159,6 +159,36 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787 help Firmware files for the Marvell Wifi-Ex 8787 module on SDIO. +config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797 + bool "Marvell Wifi-Ex SD 8797" + help + Firmware files for the Marvell Wifi-Ex 8797 module on SDIO. + +config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797 + bool "Marvell Wifi-Ex USB 8797" + help + Firmware files for the Marvell Wifi-Ex 8797 module on USB. + +config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887 + bool "Marvell Wifi-Ex SD 8887" + help + Firmware files for the Marvell Wifi-Ex 8887 module on SDIO. + +config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897 + bool "Marvell Wifi-Ex SD 8897" + help + Firmware files for the Marvell Wifi-Ex 8897 module on SDIO. + +config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897 + bool "Marvell Wifi-Ex USB 8897" + help + Firmware files for the Marvell Wifi-Ex 8897 module on USB. + +config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897 + bool "Marvell Wifi-Ex PCI-E 8897" + help + Firmware files for the Marvell Wifi-Ex 8897 module on PCI-E. + 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 768f3c4feb..d3efd65bec 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -129,6 +129,42 @@ LINUX_FIRMWARE_FILES += mrvl/sd8787_uapsta.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell endif +# sd8797 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797),y) +LINUX_FIRMWARE_FILES += mrvl/sd8797_uapsta.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell +endif + +# usb8797 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797),y) +LINUX_FIRMWARE_FILES += mrvl/usb8797_uapsta.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell +endif + +# sd8887 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887),y) +LINUX_FIRMWARE_FILES += mrvl/sd8887_uapsta.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell +endif + +# sd8897 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897),y) +LINUX_FIRMWARE_FILES += mrvl/sd8897_uapsta.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell +endif + +# usb8897 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897),y) +LINUX_FIRMWARE_FILES += mrvl/usb8897_uapsta.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell +endif + +# pcie8897 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897),y) +LINUX_FIRMWARE_FILES += mrvl/pcie8897_uapsta.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell +endif + # wl127x ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X),y) # wl1271-nvs.bin is a symlink to wl127x-nvs.bin From 1ce38192f0cfdf2900f3d8d08e2f7fe58492b1bb Mon Sep 17 00:00:00 2001 From: Alex Suykov Date: Mon, 9 Nov 2015 00:53:06 +0200 Subject: [PATCH 018/132] linux-firmware: adjust Config.in text for mwifiex With SD, USB and PCI-E variants available for several chips, bus-prefixed entries get mis-aligned badly. Rearrange them to use bus-suffixes instead. Config options and the files themselves remain bus-prefixed. Signed-off-by: Alex Suykov Signed-off-by: Peter Korsgaard --- package/linux-firmware/Config.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 32e9c6e376..d8389864ad 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -155,37 +155,37 @@ config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688 Firmware files for the Marvell SD8688 module config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787 - bool "Marvell Wifi-Ex SD 8787" + bool "Marvell Wifi-Ex 8787 SDIO" help Firmware files for the Marvell Wifi-Ex 8787 module on SDIO. config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797 - bool "Marvell Wifi-Ex SD 8797" + bool "Marvell Wifi-Ex 8797 SDIO" help Firmware files for the Marvell Wifi-Ex 8797 module on SDIO. config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797 - bool "Marvell Wifi-Ex USB 8797" + bool "Marvell Wifi-Ex 8797 USB" help Firmware files for the Marvell Wifi-Ex 8797 module on USB. config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887 - bool "Marvell Wifi-Ex SD 8887" + bool "Marvell Wifi-Ex 8887 SDIO" help Firmware files for the Marvell Wifi-Ex 8887 module on SDIO. config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897 - bool "Marvell Wifi-Ex SD 8897" + bool "Marvell Wifi-Ex 8897 SDIO" help Firmware files for the Marvell Wifi-Ex 8897 module on SDIO. config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897 - bool "Marvell Wifi-Ex USB 8897" + bool "Marvell Wifi-Ex 8897 USB" help Firmware files for the Marvell Wifi-Ex 8897 module on USB. config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897 - bool "Marvell Wifi-Ex PCI-E 8897" + bool "Marvell Wifi-Ex 8897 PCI-E" help Firmware files for the Marvell Wifi-Ex 8897 module on PCI-E. From 8645710da335c1afeea3cdb7754f07d016ae9432 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 13 Nov 2015 09:35:27 -0300 Subject: [PATCH 019/132] exiv2: bump to version 0.25 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../exiv2/0001-remove-useless-header.patch | 19 ------------------- package/exiv2/Config.in | 6 ++++-- package/exiv2/exiv2.hash | 4 ++-- package/exiv2/exiv2.mk | 2 +- 4 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 package/exiv2/0001-remove-useless-header.patch diff --git a/package/exiv2/0001-remove-useless-header.patch b/package/exiv2/0001-remove-useless-header.patch deleted file mode 100644 index 96a37348b9..0000000000 --- a/package/exiv2/0001-remove-useless-header.patch +++ /dev/null @@ -1,19 +0,0 @@ -version.cpp: remove useless header inclusion - -The inclusion of link.h header is not required and can create build -error with some toolchains. -The patch is pushed on the upstream for the next release. -http://dev.exiv2.org/issues/1007 - -Signed-off-by: Nicolas Serafini - ---- exiv2-0.24.orig/src/version.cpp 2013-12-01 13:13:42.000000000 +0100 -+++ exiv2-0.24/src/version.cpp 2014-12-04 09:30:39.667234130 +0100 -@@ -116,7 +116,6 @@ typedef string_v::iterator string_i; - #elif defined(__linux__) - # include - // http://syprog.blogspot.com/2011/12/listing-loaded-shared-objects-in-linux.html --# include "link.h" - # include - struct something - { diff --git a/package/exiv2/Config.in b/package/exiv2/Config.in index 9a7cf4467c..8ca95ebcaf 100644 --- a/package/exiv2/Config.in +++ b/package/exiv2/Config.in @@ -1,10 +1,12 @@ -comment "exiv2 needs a toolchain w/ C++, dynamic library" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP +comment "exiv2 needs a toolchain w/ C++, wchar, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_USE_WCHAR config BR2_PACKAGE_EXIV2 bool "exiv2" depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR help Exiv2 is a C++ library and a command line utility to manage image metadata. It provides fast and easy read and write diff --git a/package/exiv2/exiv2.hash b/package/exiv2/exiv2.hash index d4f8c60765..b1e78d2c94 100644 --- a/package/exiv2/exiv2.hash +++ b/package/exiv2/exiv2.hash @@ -1,4 +1,4 @@ # From http://www.exiv2.org/download.html -md5 b8a23dc56a98ede85c00718a97a8d6fc exiv2-0.24.tar.gz +md5 258d4831b30f75a01e0234065c6c2806 exiv2-0.25.tar.gz # Locally calculated -sha256 f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e exiv2-0.24.tar.gz +sha256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 exiv2-0.25.tar.gz diff --git a/package/exiv2/exiv2.mk b/package/exiv2/exiv2.mk index 93e36f725f..45f9289199 100644 --- a/package/exiv2/exiv2.mk +++ b/package/exiv2/exiv2.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXIV2_VERSION = 0.24 +EXIV2_VERSION = 0.25 EXIV2_SITE = http://www.exiv2.org EXIV2_INSTALL_STAGING = YES From 5f11f5d541abe6628c50bf7e0a3999dc6e8914e3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 13 Nov 2015 09:35:47 -0300 Subject: [PATCH 020/132] cryptsetup: bump to version 1.7.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index a0b975db16..e770f957df 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.6/sha256sums.asc -sha256 45a6ccd3c65b7d904e58e1cb3656a7e997190b6a05b5ff7c6887e4a41c5f19bc cryptsetup-1.6.8.tar.xz +sha256 075524a7cc0db36d12119fa79116750accb1c6c8825d5faa2534b74b8ce3d148 cryptsetup-1.7.0.tar.xz diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 78cbe8faec..986b131eb3 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRYPTSETUP_VERSION_MAJOR = 1.6 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).8 +CRYPTSETUP_VERSION_MAJOR = 1.7 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 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 2a5e86c9ef1eb5197b04f7734d810330daacd158 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 13 Nov 2015 10:57:48 -0300 Subject: [PATCH 021/132] libmicrohttpd: bump to version 0.9.46 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libmicrohttpd/libmicrohttpd.hash | 2 +- package/libmicrohttpd/libmicrohttpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmicrohttpd/libmicrohttpd.hash b/package/libmicrohttpd/libmicrohttpd.hash index 618d53a58d..5594cba684 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 1075def48da9327be22441f4a3460d24159fae2bf4bcfb4ab6e7ca5e95e54a69 libmicrohttpd-0.9.45.tar.gz +sha256 06dbd2654f390fa1e8196fe063fc1449a6c2ed65a38199a49bf29ad8a93b8979 libmicrohttpd-0.9.46.tar.gz diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 06b40a1826..3e8bbb15c1 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.45 +LIBMICROHTTPD_VERSION = 0.9.46 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES From 56ad2ea8d581a645f344095988d2ef93834a9a0b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 13 Nov 2015 15:45:37 +0100 Subject: [PATCH 022/132] mosquitto: bump to version 1.4.5 Signed-off-by: Peter Korsgaard --- package/mosquitto/mosquitto.hash | 2 +- package/mosquitto/mosquitto.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index e2db2137b2..31c5061d68 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 c643c7123708aadcd29287dda7b5ce7c910f75b02956a8fc4fe65ad2ea767a5f mosquitto-1.4.4.tar.gz +sha256 b432e19fee0c549f4a0fb0e866d1b6a897b38dbf1ddfda92bb43e2a24f01df66 mosquitto-1.4.5.tar.gz diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index efeb32d2ee..2db317307b 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 1.4.4 +MOSQUITTO_VERSION = 1.4.5 MOSQUITTO_SITE = http://mosquitto.org/files/source MOSQUITTO_LICENSE = EPLv1.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 From 7453c4bf6010b3a8dd794c39e327641abea15503 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 13 Nov 2015 14:45:56 -0300 Subject: [PATCH 023/132] cmake: bump to version 3.4.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 8d130d7b09..469f559e81 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,2 +1,2 @@ -# From http://www.cmake.org/files/v3.3/cmake-3.3.2-SHA-256.txt -sha256 e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 cmake-3.3.2.tar.gz +# From http://www.cmake.org/files/v3.4/cmake-3.4.0-SHA-256.txt +sha256 a5b82bf6ace6c481cdb911fd5d372a302740cbefd387e05297cb37f7468d1cea cmake-3.4.0.tar.gz diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 0f888fdedf..87ed8ff1da 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.3 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2 +CMAKE_VERSION_MAJOR = 3.4 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0 CMAKE_SITE = http://www.cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3c CMAKE_LICENSE_FILES = Copyright.txt From 7e5d5036686320294bc16def57fab8cda6f46815 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 13 Nov 2015 16:35:44 -0300 Subject: [PATCH 024/132] gdk-pixbuf: bump to version 2.32.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gdk-pixbuf/gdk-pixbuf.hash | 4 ++-- package/gdk-pixbuf/gdk-pixbuf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.hash b/package/gdk-pixbuf/gdk-pixbuf.hash index 3bf6ae68a1..478d96a218 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.hash +++ b/package/gdk-pixbuf/gdk-pixbuf.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.32/gdk-pixbuf-2.32.1.sha256sum -sha256 4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc gdk-pixbuf-2.32.1.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.32/gdk-pixbuf-2.32.2.sha256sum +sha256 d3ab06fc123b13effed4c27c77cebdfad2173ff20628d82c397b7660ae926145 gdk-pixbuf-2.32.2.tar.xz diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index 1167fb9138..a41c262117 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -5,7 +5,7 @@ ################################################################################ GDK_PIXBUF_VERSION_MAJOR = 2.32 -GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).1 +GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).2 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) GDK_PIXBUF_LICENSE = LGPLv2+ From 3a1998bdb86196699b034e94cf0b4638f0d492f2 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 12 Nov 2015 23:33:05 +0100 Subject: [PATCH 025/132] olimex_a20_olinuxino_lime: bump u-boot to 2015.10 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_lime_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 53286b4894..e30a070043 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -36,7 +36,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.10" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y From 9fb4a3487f7c949e517eea219a9ae87f7d9d25b3 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 13 Nov 2015 22:09:28 +0100 Subject: [PATCH 026/132] libevdev: bump version to 1.4.5 Changelog (see [1] for details): Only a small fix, the suggested hwdb entry that the touchpad-edge-detector printed used the wrong codes for ABS_X and ABS_Y. Fixed with this release, the output is now suitable for copy/paste into the udev hwdb. [1] http://lists.freedesktop.org/archives/input-tools/2015-November/001227.html Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/libevdev/libevdev.hash | 4 ++-- package/libevdev/libevdev.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libevdev/libevdev.hash b/package/libevdev/libevdev.hash index 1e44bf8f7c..af78c0f995 100644 --- a/package/libevdev/libevdev.hash +++ b/package/libevdev/libevdev.hash @@ -1,2 +1,2 @@ -# Hash from http://lists.freedesktop.org/archives/input-tools/2015-August/001210.html -sha256 ed9979369b6a6e28f5897d099538549ecffb2b7c00c1b717eb77c31d85bc45a9 libevdev-1.4.4.tar.xz +# Hash from http://lists.freedesktop.org/archives/input-tools/2015-November/001227.html +sha256 e91c58ca86e0631186798449e0a78c65474ff562081d968ba0521f76c8c2ca1d libevdev-1.4.5.tar.xz diff --git a/package/libevdev/libevdev.mk b/package/libevdev/libevdev.mk index 97d8a92e2f..b126943c00 100644 --- a/package/libevdev/libevdev.mk +++ b/package/libevdev/libevdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.4.4 +LIBEVDEV_VERSION = 1.4.5 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz LIBEVDEV_LICENSE = X11 From 36862c71a82dd29db14508b5d37c816b33f9463b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 13 Nov 2015 15:05:54 -0300 Subject: [PATCH 027/132] libsigc: bump to version 2.6.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libsigc/Config.in | 5 +++-- package/libsigc/libsigc.hash | 4 ++-- package/libsigc/libsigc.mk | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/libsigc/Config.in b/package/libsigc/Config.in index ae984c8246..41ea19e227 100644 --- a/package/libsigc/Config.in +++ b/package/libsigc/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBSIGC bool "libsigc++" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 depends on BR2_INSTALL_LIBSTDCPP help libsigc++ implements a typesafe callback system for standard C++. @@ -9,5 +10,5 @@ config BR2_PACKAGE_LIBSIGC http://libsigc.sourceforge.net/ -comment "libsigc++ needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "libsigc++ needs a toolchain w/ C++, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/libsigc/libsigc.hash b/package/libsigc/libsigc.hash index 21c0e99d1e..b9c99c5ee8 100644 --- a/package/libsigc/libsigc.hash +++ b/package/libsigc/libsigc.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/2.2/libsigc++-2.2.11.sha256sum -sha256 9834045f74f56752c2c6b3cdc195c30ab8314ad22dc8e626d6f67f940f1e4957 libsigc++-2.2.11.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/2.6/libsigc++-2.6.2.sha256sum +sha256 fdace7134c31de792c17570f9049ca0657909b28c4c70ec4882f91a03de54437 libsigc++-2.6.2.tar.xz diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk index 7c127c4295..0dc5d24fba 100644 --- a/package/libsigc/libsigc.mk +++ b/package/libsigc/libsigc.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSIGC_VERSION_MAJOR = 2.2 -LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).11 +LIBSIGC_VERSION_MAJOR = 2.6 +LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).2 LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) LIBSIGC_DEPENDENCIES = host-m4 From 5fcd6c4a3aed1a7ef7e5f27fa4c2b59eef7374f9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 13 Nov 2015 15:05:55 -0300 Subject: [PATCH 028/132] glibmm: bump to version 2.46.1 Adjust pulseview/libsigrok for the gcc >= 4.8 dependency. Line wrap comment depends for pulseview. Drop redundant libsigrok depend on comment for libsigrok++. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/glibmm/Config.in | 7 ++++--- package/glibmm/glibmm.hash | 4 ++-- package/glibmm/glibmm.mk | 2 +- package/libsigrok/Config.in | 7 ++++--- package/pulseview/Config.in | 7 ++++--- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/package/glibmm/Config.in b/package/glibmm/Config.in index 6ac4be5432..fdbb43812c 100644 --- a/package/glibmm/Config.in +++ b/package/glibmm/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_GLIBMM bool "glibmm" select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBSIGC + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 @@ -11,7 +12,7 @@ config BR2_PACKAGE_GLIBMM http://www.gtkmm.org/ -comment "glibmm needs a toolchain w/ C++, wchar, threads" +comment "glibmm needs a toolchain w/ C++, wchar, threads, gcc >= 4.8" depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/glibmm/glibmm.hash b/package/glibmm/glibmm.hash index 4fbde55a35..9a7a6c889a 100644 --- a/package/glibmm/glibmm.hash +++ b/package/glibmm/glibmm.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.36/glibmm-2.36.1.sha256sum -sha256 d1f7dec2fd75ea95034ec143fcf2ff77a02e92aacf3e0cc110f9c67e7fe23766 glibmm-2.36.1.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.46/glibmm-2.46.1.sha256sum +sha256 9647e596c1081d2ea202bd3da2824ec2ea359498fa86eb59a55b1b307dd8c4aa glibmm-2.46.1.tar.xz diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk index 4081251da0..66b357d400 100644 --- a/package/glibmm/glibmm.mk +++ b/package/glibmm/glibmm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLIBMM_VERSION_MAJOR = 2.36 +GLIBMM_VERSION_MAJOR = 2.46 GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).1 GLIBMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools) GLIBMM_LICENSE_FILES = COPYING COPYING.tools diff --git a/package/libsigrok/Config.in b/package/libsigrok/Config.in index 6ef37768f6..ff2d249827 100644 --- a/package/libsigrok/Config.in +++ b/package/libsigrok/Config.in @@ -24,12 +24,13 @@ config BR2_PACKAGE_LIBSIGROKCXX bool "build C++ bindings" select BR2_PACKAGE_GLIBMM depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # glibmm help Build libsigrok C++ bindings as well. -comment "C++ bindings need a toolchain w/ C++" - depends on BR2_PACKAGE_LIBSIGROK - depends on !BR2_INSTALL_LIBSTDCPP +comment "C++ bindings need a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 endif diff --git a/package/pulseview/Config.in b/package/pulseview/Config.in index e6ddc211e4..bbbfd7672e 100644 --- a/package/pulseview/Config.in +++ b/package/pulseview/Config.in @@ -17,15 +17,16 @@ config BR2_PACKAGE_PULSEVIEW depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS # libsigrok - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 help PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI for sigrok. http://sigrok.org/wiki/PulseView -comment "pulseview needs a toolchain w/ wchar, threads, C++, gcc >= 4.7" +comment "pulseview needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" depends on BR2_USE_MMU depends on BR2_PACKAGE_QT5 depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP From d7f2977eb6b17713f9741db26a8efe9083849b05 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 13 Nov 2015 15:05:56 -0300 Subject: [PATCH 029/132] libxmlpp: bump to version 2.40.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libxmlpp/Config.in | 7 ++++--- package/libxmlpp/libxmlpp.hash | 4 ++-- package/libxmlpp/libxmlpp.mk | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/libxmlpp/Config.in b/package/libxmlpp/Config.in index cb5f3c0ffb..0f2da98f24 100644 --- a/package/libxmlpp/Config.in +++ b/package/libxmlpp/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBXMLPP bool "libxml++" select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_GLIBMM + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # glibmm -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glibmm -> libglib2 @@ -11,7 +12,7 @@ config BR2_PACKAGE_LIBXMLPP http://libxmlplusplus.sourceforge.net/ -comment "libxml++ needs a toolchain w/ C++, wchar, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS +comment "libxml++ needs a toolchain w/ C++, wchar, threads, gcc >= 4.8" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \ + ||!BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU diff --git a/package/libxmlpp/libxmlpp.hash b/package/libxmlpp/libxmlpp.hash index 9e1ae181ae..5fc7f5beb4 100644 --- a/package/libxmlpp/libxmlpp.hash +++ b/package/libxmlpp/libxmlpp.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.34/libxml++-2.34.2.sha256sum -sha256 77daba20ab76631071d4ed4cc18fa2e981160ca05ae661e8d146f2b0728f9baa libxml++-2.34.2.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.40/libxml++-2.40.1.sha256sum +sha256 4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9 libxml++-2.40.1.tar.xz diff --git a/package/libxmlpp/libxmlpp.mk b/package/libxmlpp/libxmlpp.mk index d9dd862420..d42819928a 100644 --- a/package/libxmlpp/libxmlpp.mk +++ b/package/libxmlpp/libxmlpp.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBXMLPP_VERSION_MAJOR = 2.34 -LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).2 +LIBXMLPP_VERSION_MAJOR = 2.40 +LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).1 LIBXMLPP_LICENSE = LGPLv2.1 (library), LGPLv2+ (examples) LIBXMLPP_LICENSE_FILES = COPYING LIBXMLPP_SOURCE = libxml++-$(LIBXMLPP_VERSION).tar.xz From 67a723248f6e4adcf868a1cdeff71640411dd40d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 14 Nov 2015 00:16:58 +0100 Subject: [PATCH 030/132] fbgrab: bump verstion to 1.3 Changelog (see [1] for details): - Added support when active framebuffer is not starting at offset 0 - Fixed broken re-ordering of colors, rgba to argb - Fixed broken path for man page [1] http://fbgrab.monells.se Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/fbgrab/fbgrab.hash | 2 +- package/fbgrab/fbgrab.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fbgrab/fbgrab.hash b/package/fbgrab/fbgrab.hash index 4652f2c8a5..de3bc1ffd7 100644 --- a/package/fbgrab/fbgrab.hash +++ b/package/fbgrab/fbgrab.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 61e0772ad6ea744ee597ae478398ddd0ba6fceee2cf343859bebde2c15bafb91 fbgrab-1.2.tar.gz +sha256 5fab478cbf8731fbacefaa76236a8f8b38ccff920c53b3a8253bc35509fba8ed fbgrab-1.3.tar.gz diff --git a/package/fbgrab/fbgrab.mk b/package/fbgrab/fbgrab.mk index b60da9a497..4455423126 100644 --- a/package/fbgrab/fbgrab.mk +++ b/package/fbgrab/fbgrab.mk @@ -4,7 +4,7 @@ # ################################################################################ -FBGRAB_VERSION = 1.2 +FBGRAB_VERSION = 1.3 FBGRAB_SITE = http://fbgrab.monells.se FBGRAB_DEPENDENCIES = libpng FBGRAB_LICENSE = GPLv2 From 093db034ed4b097c9f03cb5ec13bc2a1736c9a2b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Nov 2015 00:07:25 +0100 Subject: [PATCH 031/132] package/ffmpeg: bump version to 2.8.2 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index d0175cc6d7..e984b58148 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5790162028a868234f4f60b030f5f51bd70785de8a27878e271df029cdf4cb9a ffmpeg-2.8.1.tar.xz +sha256 d2e61d445397940e24ed5afeccfa2c70484a2db1bdc15614f5eaaf171f1d350e ffmpeg-2.8.2.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index d25346cd9e..988374f74b 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 2.8.1 +FFMPEG_VERSION = 2.8.2 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From eab50f5aea32ed44b67ebd05ccb4d770820dcd77 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Nov 2015 00:07:26 +0100 Subject: [PATCH 032/132] package/{mesa3d, mesa3d-headers}: bump version to 11.0.5 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 91f5fe869b..e65f01dbd1 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.0.4 +MESA3D_HEADERS_VERSION = 11.0.5 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 5ac885f52e..8b9c8c642e 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,2 +1,2 @@ -# From http://lists.freedesktop.org/archives/mesa-announce/2015-October/000180.html -sha256 40201bf7fc6fa12a6d9edfe870b41eb4dd6669154e3c42c48a96f70805f5483d mesa-11.0.4.tar.xz +# From http://lists.freedesktop.org/archives/mesa-announce/2015-November/000181.html +sha256 9c255a2a6695fcc6ef4a279e1df0aeaf417dc142f39ee59dfb533d80494bb67a mesa-11.0.5.tar.xz diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 15944894d4..4f484f78f2 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.0.4 +MESA3D_VERSION = 11.0.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos From 8058e622b5dd78b1ad9a11d2efd8fca5c2a8c98b Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 14 Nov 2015 23:25:19 +0200 Subject: [PATCH 033/132] cryptsetup: fix hash source link Cc: Gustavo Zacarias Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/cryptsetup/cryptsetup.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index e770f957df..8fbbc7d3fb 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.6/sha256sums.asc +# From https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/sha256sums.asc sha256 075524a7cc0db36d12119fa79116750accb1c6c8825d5faa2534b74b8ce3d148 cryptsetup-1.7.0.tar.xz From daf9b1524d6a55a1205bce8183d4dbe5c53426bd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Nov 2015 00:26:31 +0100 Subject: [PATCH 034/132] package/x11r7/xapp_xinput: bump version to 1.6.2 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xinput/xapp_xinput.hash | 4 ++-- package/x11r7/xapp_xinput/xapp_xinput.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xinput/xapp_xinput.hash b/package/x11r7/xapp_xinput/xapp_xinput.hash index a8f6b702d8..724b2e2637 100644 --- a/package/x11r7/xapp_xinput/xapp_xinput.hash +++ b/package/x11r7/xapp_xinput/xapp_xinput.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002321.html -sha256 b7632d0f228a8a6be93b09857ea413940fcf44091e60f4a0fe9f5fd82efd871f xinput-1.6.1.tar.bz2 +# From http://lists.x.org/archives/xorg-announce/2015-October/002643.html +sha256 3694d29b4180952fbf13c6d4e59541310cbb11eef5bf888ff3d8b7f4e3aee5c4 xinput-1.6.2.tar.bz2 diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk index 099408b252..aaa7a80818 100644 --- a/package/x11r7/xapp_xinput/xapp_xinput.mk +++ b/package/x11r7/xapp_xinput/xapp_xinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XINPUT_VERSION = 1.6.1 +XAPP_XINPUT_VERSION = 1.6.2 XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2 XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XINPUT_LICENSE = MIT From f39fff6d698db939d9e4d313d58c7ab28e6cd1a1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Nov 2015 00:26:32 +0100 Subject: [PATCH 035/132] package/x11r7/xapp_xkbcomp: bump version to 1.3.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash | 4 ++-- package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash index b49d5a214b..bc85caa6ed 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2014-November/002497.html -sha256 cfac973778fabf5216121ad60b7af8ab74ce7513af0f9260cf8c5309e1622b2a xkbcomp-1.3.0.tar.bz2 +# From http://lists.x.org/archives/xorg-announce/2015-November/002653.html +sha256 0304dc9e0d4ac10831a9ef5d5419722375ddbc3eac3ff4413094d57bc1f1923d xkbcomp-1.3.1.tar.bz2 diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk index 0a727426d3..fea7fa8e8c 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XKBCOMP_VERSION = 1.3.0 +XAPP_XKBCOMP_VERSION = 1.3.1 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XKBCOMP_LICENSE = MIT From b27b014846d44445ac9d38f655561da17c8592c4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Nov 2015 00:26:33 +0100 Subject: [PATCH 036/132] package/x11r7/xkeyboard-config: bump version to 2.16 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xkeyboard-config/xkeyboard-config.hash | 4 ++-- package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.hash b/package/x11r7/xkeyboard-config/xkeyboard-config.hash index c9bdca2987..7b67d0cdf2 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.hash +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-May/002609.html -sha256 0e443cf7ca2f0b40846472c029647a05933fc705d611e1478c4db8a48a6f38bf xkeyboard-config-2.15.tar.bz2 +# From http://lists.x.org/archives/xorg-announce/2015-October/002642.html +sha256 1e8a1f212c96b7f71ca0b05da361cac1816d27baae1d8e03e7b53049b58d1d58 xkeyboard-config-2.16.tar.bz2 diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk index f88686b5d0..1ab935031d 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk @@ -4,7 +4,7 @@ # ################################################################################ -XKEYBOARD_CONFIG_VERSION = 2.15 +XKEYBOARD_CONFIG_VERSION = 2.16 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config XKEYBOARD_CONFIG_LICENSE = MIT From a458f926bb6afce2791ffb5e76595c7e4834126d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Nov 2015 00:26:34 +0100 Subject: [PATCH 037/132] package/x11r7/xdriver_xf86-input-evdev: bump version to 2.10.0 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash | 4 ++-- .../xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash index 330ac30364..cd892d37e1 100644 --- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-March/002557.html -sha256 792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec xf86-input-evdev-2.9.2.tar.bz2 +# From http://lists.x.org/archives/xorg-announce/2015-October/002649.html +sha256 d097298eb07b7a9edf4493b5c3c058041458ca52c8c62dbd4f40b84c5086d117 xf86-input-evdev-2.10.0.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk index 6019412d6a..1e90afa1fd 100644 --- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.9.2 +XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.10.0 XDRIVER_XF86_INPUT_EVDEV_SOURCE = xf86-input-evdev-$(XDRIVER_XF86_INPUT_EVDEV_VERSION).tar.bz2 XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_EVDEV_LICENSE = MIT From 5101ea58d52fe4edd9ac74d6f144ade1e374bf50 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Nov 2015 00:26:35 +0100 Subject: [PATCH 038/132] package/libinput: bump version to 1.1.0 Also rebased 0001-rename-log_msg-to-libinput_log_msg.patch. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...1-rename-log_msg-to-libinput_log_msg.patch | 24 +++++++++++++++---- package/libinput/libinput.hash | 4 ++-- package/libinput/libinput.mk | 2 +- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/package/libinput/0001-rename-log_msg-to-libinput_log_msg.patch b/package/libinput/0001-rename-log_msg-to-libinput_log_msg.patch index 433b29ef02..e36862a12d 100644 --- a/package/libinput/0001-rename-log_msg-to-libinput_log_msg.patch +++ b/package/libinput/0001-rename-log_msg-to-libinput_log_msg.patch @@ -22,9 +22,9 @@ diff --git a/src/libinput-private.h b/src/libinput-private.h index b36dc95..98f91b3 100644 --- a/src/libinput-private.h +++ b/src/libinput-private.h -@@ -179,15 +179,15 @@ struct libinput_event_listener { - typedef void (*libinput_source_dispatch_t)(void *data); +@@ -259,12 +259,12 @@ + typedef void (*libinput_source_dispatch_t)(void *data); -#define log_debug(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__) -#define log_info(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__) @@ -39,17 +39,22 @@ index b36dc95..98f91b3 100644 +#define log_bug_libinput(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "libinput bug: " __VA_ARGS__) +#define log_bug_client(li_, ...) libinput_log_msg((li_), LIBINPUT_LOG_PRIORITY_ERROR, "client bug: " __VA_ARGS__) + #define log_debug_ratelimit(li_, r_, ...) log_msg_ratelimit((li_), (r_), LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__) + #define log_info_ratelimit(li_, r_, ...) log_msg_ratelimit((li_), (r_), LIBINPUT_LOG_PRIORITY_INFO, __VA_ARGS__) +@@ -281,7 +281,7 @@ + LIBINPUT_ATTRIBUTE_PRINTF(4, 5); + void -log_msg(struct libinput *libinput, +libinput_log_msg(struct libinput *libinput, enum libinput_log_priority priority, - const char *format, ...); - + const char *format, ...) + LIBINPUT_ATTRIBUTE_PRINTF(3, 4); diff --git a/src/libinput.c b/src/libinput.c index 279cce0..5748e5e 100644 --- a/src/libinput.c +++ b/src/libinput.c -@@ -107,7 +107,7 @@ log_msg_va(struct libinput *libinput, +@@ -155,7 +155,7 @@ } void @@ -58,6 +63,15 @@ index 279cce0..5748e5e 100644 enum libinput_log_priority priority, const char *format, ...) { +@@ -184,7 +184,7 @@ + va_end(args); + + if (state == RATELIMIT_THRESHOLD) +- log_msg(libinput, ++ libinput_log_msg(libinput, + priority, + "WARNING: log rate limit exceeded (%d msgs per %dms). Discarding future messages.\n", + ratelimit->burst, -- 2.1.2 diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index 299a28f985..18bd4a7451 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,2 +1,2 @@ -# From http://lists.freedesktop.org/archives/wayland-devel/2015-July/023184.html -sha256 69a97da47ef8fa9debadaa8ee11005b9b5183bd2b87c5aa7827b7c388a5acc5d libinput-0.19.0.tar.xz +# From http://lists.freedesktop.org/archives/wayland-devel/2015-October/025065.html +sha256 673186ea2a0d2b695afaa9758834f9217b175774d9ae222e1b43ff63c663f582 libinput-1.1.0.tar.xz diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 175e04f507..8b51b2b33e 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 0.19.0 +LIBINPUT_VERSION = 1.1.0 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_LICENSE = MIT From 21d13bd5ffbb711330000feb5700d2f534a13d30 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Nov 2015 00:26:36 +0100 Subject: [PATCH 039/132] package/x11r7/xdriver_xf86-input-libinput: bump version to 0.15.0 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-input-libinput.hash | 4 ++-- .../xdriver_xf86-input-libinput.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash index 3936f014c3..be0bf09754 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-July/002619.html -sha256 db8f919c24a381cec1e7840f1f2117251501c0c7ae2a43941d84753154a826d6 xf86-input-libinput-0.12.0.tar.bz2 +# From http://lists.x.org/archives/xorg-announce/2015-October/002648.html +sha256 28707c504194648b11a1e26acf13039b60bf344efa6aa9788afed6d47f019a41 xf86-input-libinput-0.15.0.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk index 30973eab23..b4bc4b88c9 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.12.0 +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.15.0 XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2 XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT From de2ea6ad54907c575120cf0d613f1a7b8a7162f3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Nov 2015 00:26:37 +0100 Subject: [PATCH 040/132] package/x11r7/xdriver_xf86-input-synaptics: bump version to 1.8.3 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-input-synaptics.hash | 4 ++-- .../xdriver_xf86-input-synaptics.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash index 7b7216d247..3cb0758089 100644 --- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash +++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-March/002556.html -sha256 7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80 xf86-input-synaptics-1.8.2.tar.bz2 +# From http://lists.x.org/archives/xorg-announce/2015-November/002652.html +sha256 d39f100c74f3673778b53f17bab7690161925e25dd998a15dd8cc69b52e83f01 xf86-input-synaptics-1.8.3.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk index 28663d17be..b6ade4c86e 100644 --- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk +++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.8.2 +XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.8.3 XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).tar.bz2 XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE = MIT From b282351c13e7f5bca4865cbe0b9597dbc75cebb3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Nov 2015 00:26:40 +0100 Subject: [PATCH 041/132] package/pixman: bump version to 0.33.4 Removed patches applied upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/pixman/0001-check-fe-divbyzero.patch | 41 ------------------- ...re-processor-issues-in-LEAF_MIPS32R2.patch | 33 --------------- package/pixman/pixman.hash | 4 +- package/pixman/pixman.mk | 3 +- 4 files changed, 4 insertions(+), 77 deletions(-) delete mode 100644 package/pixman/0001-check-fe-divbyzero.patch delete mode 100644 package/pixman/0002-Fix-C-pre-processor-issues-in-LEAF_MIPS32R2.patch diff --git a/package/pixman/0001-check-fe-divbyzero.patch b/package/pixman/0001-check-fe-divbyzero.patch deleted file mode 100644 index 01c6c96de6..0000000000 --- a/package/pixman/0001-check-fe-divbyzero.patch +++ /dev/null @@ -1,41 +0,0 @@ -Add a check for FE_DIVBYZERO - -Some architectures (namely Microblaze) do have fenv.h and -feenableexcept, but they don't have the FE_DIVBYZERO definition. This -patch adds a configure check for FE_DIVBYZERO, and only uses it if -it's available. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -838,6 +838,11 @@ - AC_DEFINE(HAVE_FEENABLEEXCEPT, 1, [Whether we have feenableexcept()]) - fi - -+AC_CHECK_DECL([FE_DIVBYZERO], [], [], [[#include ]]) -+if test x$ac_cv_have_decl_FE_DIVBYZERO = xyes; then -+ AC_DEFINE(HAVE_FEDIVBYZERO, 1, [Whether we have FE_DIVBYZERO]) -+fi -+ - AC_CHECK_FUNC(gettimeofday, have_gettimeofday=yes, have_gettimeofday=no) - AC_CHECK_HEADER(sys/time.h, have_sys_time_h=yes, have_sys_time_h=no) - if test x$have_gettimeofday = xyes && test x$have_sys_time_h = xyes; then -Index: b/test/utils.c -=================================================================== ---- a/test/utils.c -+++ b/test/utils.c -@@ -776,9 +776,11 @@ - { - #ifdef HAVE_FENV_H - #ifdef HAVE_FEENABLEEXCEPT -+#ifdef HAVE_FE_DIVBYZERO - feenableexcept (FE_DIVBYZERO); - #endif - #endif -+#endif - } - - void * diff --git a/package/pixman/0002-Fix-C-pre-processor-issues-in-LEAF_MIPS32R2.patch b/package/pixman/0002-Fix-C-pre-processor-issues-in-LEAF_MIPS32R2.patch deleted file mode 100644 index b898fa5e65..0000000000 --- a/package/pixman/0002-Fix-C-pre-processor-issues-in-LEAF_MIPS32R2.patch +++ /dev/null @@ -1,33 +0,0 @@ -pixman: Fix C pre-processor issues in LEAF_MIPS32R2 - -Signed-off-by: Vicente Olivert Riera - -From 3a60aa8d574f4dfc4fa3ddb13aaa13c7d955105b Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Thu, 11 Sep 2014 10:24:10 +0100 -Subject: [PATCH] Fix C pre-processor issues in LEAF_MIPS32R2 - -Signed-off-by: Vicente Olivert Riera ---- - pixman/pixman-mips-dspr2-asm.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pixman/pixman-mips-dspr2-asm.h b/pixman/pixman-mips-dspr2-asm.h -index 11849bd..b2696d0 100644 ---- a/pixman/pixman-mips-dspr2-asm.h -+++ b/pixman/pixman-mips-dspr2-asm.h -@@ -72,10 +72,10 @@ - #define LEAF_MIPS32R2(symbol) \ - .globl symbol; \ - .align 2; \ --#ifdef __ELF__ -+ .if __ELF__; \ - .hidden symbol; \ - .type symbol, @function; \ --#endif -+ .endif; \ - .ent symbol, 0; \ - symbol: .frame sp, 0, ra; \ - .set push; \ --- -1.7.1 diff --git a/package/pixman/pixman.hash b/package/pixman/pixman.hash index 04e2620d7f..66decf685c 100644 --- a/package/pixman/pixman.hash +++ b/package/pixman/pixman.hash @@ -1,2 +1,2 @@ -# From http://cairographics.org/releases/pixman-0.32.8.tar.gz.sha1 -sha1 c1119bbdb587c56009b653e6f81c083f98a20135 pixman-0.32.8.tar.gz +# From http://lists.x.org/archives/xorg-announce/2015-October/002644.html +sha1 dff77cd08412b33ab0294057ade93e401c8a9302 pixman-0.33.4.tar.bz2 diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 0e4b0b953e..cbf57fede2 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -4,7 +4,8 @@ # ################################################################################ -PIXMAN_VERSION = 0.32.8 +PIXMAN_VERSION = 0.33.4 +PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.bz2 PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib PIXMAN_LICENSE = MIT PIXMAN_LICENSE_FILES = COPYING From f99baf41ab9fb15cd874c1e90ba7fe0a6eefdcbb Mon Sep 17 00:00:00 2001 From: Phil Eichinger Date: Mon, 16 Nov 2015 11:25:04 +0100 Subject: [PATCH 042/132] swig: use a relative path for the host swig2.0 symlink's target An absolute path isn't really necessary and breaks relocating Signed-off-by: Phil Eichinger Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/swig/swig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/swig/swig.mk b/package/swig/swig.mk index 3f3ab2ff0c..6b9b8aebcb 100644 --- a/package/swig/swig.mk +++ b/package/swig/swig.mk @@ -25,7 +25,7 @@ SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES # swig, so that our swig always gets used. define HOST_SWIG_INSTALL_SYMLINK - ln -fs $(HOST_DIR)/usr/bin/swig $(HOST_DIR)/usr/bin/swig$(SWIG_VERSION_MAJOR) + ln -fs swig $(HOST_DIR)/usr/bin/swig$(SWIG_VERSION_MAJOR) endef HOST_SWIG_POST_INSTALL_HOOKS += HOST_SWIG_INSTALL_SYMLINK From eba26d53d2db1822b20f134bb20b07365a12c38f Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 17 Nov 2015 11:52:13 +0000 Subject: [PATCH 043/132] ltp-testsuite: bump to version 20150903 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/ltp-testsuite/ltp-testsuite.hash | 6 ++++-- package/ltp-testsuite/ltp-testsuite.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index 5923dafd03..d60b8a444e 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,2 +1,4 @@ -# Locally computed: -sha256 ad504e6697b964787f51caad6d8a916caa367f241ac602545548488195216a80 ltp-full-20150420.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20150903/ltp-full-20150903.tar.xz.md5 +md5 4ee849923b69f79b5208e71f3ed20484 ltp-full-20150903.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20150903/ltp-full-20150903.tar.xz.sha1 +sha1 d39bb3a41bfd1fd584703cf066fb2e935af0c00a ltp-full-20150903.tar.xz diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 64467de697..78dc9f4c05 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20150420 +LTP_TESTSUITE_VERSION = 20150903 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) LTP_TESTSUITE_LICENSE = GPLv2 GPLv2+ From 6267f34afdd06ad848bbf7a2975cb279132b6ba0 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 16 Nov 2015 16:54:12 +0000 Subject: [PATCH 044/132] hidapi: new package [Thomas: - use BR2_INIT_SYSTEMD instead of BR2_PACKAGE_SYSTEMD for the libgudev handling. This is consistent with what we do in libmbim, modem-manager and network-manager. Only udisks is diverging from this by using BR2_PACKAGE_SYSTEMD. - Fix the license info: it is GPLv3 *or* BSD-3c *or* the specific HIDAPI license. Added LICENSE-orig.txt to LICENSE_FILES.] Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/hidapi/Config.in | 20 ++++++++++++++++++++ package/hidapi/hidapi.hash | 2 ++ package/hidapi/hidapi.mk | 28 ++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+) create mode 100644 package/hidapi/Config.in create mode 100644 package/hidapi/hidapi.hash create mode 100644 package/hidapi/hidapi.mk diff --git a/package/Config.in b/package/Config.in index 0a80afb468..39a5af7fb8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -865,6 +865,7 @@ menu "Hardware handling" source "package/ccid/Config.in" source "package/dtc/Config.in" source "package/gnu-efi/Config.in" + source "package/hidapi/Config.in" source "package/lcdapi/Config.in" source "package/libaio/Config.in" source "package/libatasmart/Config.in" diff --git a/package/hidapi/Config.in b/package/hidapi/Config.in new file mode 100644 index 0000000000..5d025bfec5 --- /dev/null +++ b/package/hidapi/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_HIDAPI + bool "hidapi" + depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + select BR2_PACKAGE_LIBUSB + # When eudev is used as the udev provider, libgudev is + # automatically provided as it is part of eudev. However, when + # systemd is used as the udev provider, libgudev is not + # provided, and needs to be built separately. This is why we + # select the libgudev package only if systemd is used. + select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD + help + HIDAPI is a multi-platform library which allows an application + to interface with USB and Bluetooth HID-Class devices on + Windows, Linux, and Mac OS X. + + http://www.signal11.us/oss/hidapi/ + +comment "hidapi needs udev /dev management and a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_HAS_UDEV diff --git a/package/hidapi/hidapi.hash b/package/hidapi/hidapi.hash new file mode 100644 index 0000000000..ba00df2e90 --- /dev/null +++ b/package/hidapi/hidapi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 33e206f5e145fc1bc6aeb55084d71b55d686533d23ad5bb762746ceba81e728b hidapi-d17db57b9d4354752e0af42f5f33007a42ef2906.tar.gz diff --git a/package/hidapi/hidapi.mk b/package/hidapi/hidapi.mk new file mode 100644 index 0000000000..2457554748 --- /dev/null +++ b/package/hidapi/hidapi.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# hidapi +# +################################################################################ + +# Use master version as the current stable is very old and some bugs +# have been fixed since then. +HIDAPI_VERSION = d17db57b9d4354752e0af42f5f33007a42ef2906 +HIDAPI_SITE = $(call github,signal11,hidapi,$(HIDAPI_VERSION)) +HIDAPI_INSTALL_STAGING = YES +# No configure provided, so we need to autoreconf. +HIDAPI_AUTORECONF = YES +HIDAPI_LICENSE = GPLv3 or BSD-3c or HIDAPI license +HIDAPI_LICENSE_FILES = LICENSE.txt LICENSE-gpl3.txt LICENSE-bsd.txt LICENSE-orig.txt + +HIDAPI_DEPENDENCIES = libusb + +# When eudev is used as the udev provider, libgudev is automatically +# provided as it is part of eudev. However, when systemd is used as +# the udev provider, libgudev is not provided, and needs to be built +# separately. This is why we depend on the libgudev package only if +# systemd is used. +ifeq ($(BR2_INIT_SYSTEMD),y) +HIDAPI_DEPENDENCIES += libgudev +endif + +$(eval $(autotools-package)) From 29d1f8d1b616fefeaf6a90590f64ea762eb09b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Tue, 17 Nov 2015 17:16:25 +0100 Subject: [PATCH 045/132] skeleton: remove unused /etc/issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /etc/issue is managed with BR2_TARGET_GENERIC_ISSUE. In case BR2_TARGET_GENERIC_ISSUE is set (which is default), /etc/issue is overwritten. In case BR2_TARGET_GENERIC_ISSUE is not set, we don't want /etc/issue exist. Finaly, remove /etc/issue from skeleton. Signed-off-by: Jérôme Pouiller Reviewed-by: "Maxime Hadjinlian" Signed-off-by: Peter Korsgaard --- system/skeleton/etc/issue | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 system/skeleton/etc/issue diff --git a/system/skeleton/etc/issue b/system/skeleton/etc/issue deleted file mode 100644 index 90f177983b..0000000000 --- a/system/skeleton/etc/issue +++ /dev/null @@ -1,3 +0,0 @@ - -Welcome to Buildroot - From 4b13641be6a83aca80a7a9bdfe03f71465355b3c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 15 Nov 2015 13:24:55 +0100 Subject: [PATCH 046/132] boost: specify architecture variant for sparc Instead of using a patch to specify the architecture variant for sparc, use some Boost configure variables. [Thomas: reword commit log.] Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...Remove-bogus-c3-cpu-varant-for-SPARC.patch | 42 ------------------- package/boost/boost.mk | 4 ++ 2 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 package/boost/0003-Remove-bogus-c3-cpu-varant-for-SPARC.patch diff --git a/package/boost/0003-Remove-bogus-c3-cpu-varant-for-SPARC.patch b/package/boost/0003-Remove-bogus-c3-cpu-varant-for-SPARC.patch deleted file mode 100644 index a4d39b31db..0000000000 --- a/package/boost/0003-Remove-bogus-c3-cpu-varant-for-SPARC.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ec60c37295146bb80aa44a92cf416027b75b5ff7 Mon Sep 17 00:00:00 2001 -From: Vladimir Prus -Date: Mon, 27 Apr 2015 19:12:54 +0300 -Subject: [PATCH] Remove bogus 'c3' cpu varant for SPARC. - -Signed-off-by: Gustavo Zacarias ---- - src/tools/gcc.jam | 3 +-- - src/tools/gcc.py | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/tools/gcc.jam b/src/tools/gcc.jam -index eff95ae..128ab84 100644 ---- a/tools/build/src/tools/gcc.jam -+++ b/tools/build/src/tools/gcc.jam -@@ -1138,8 +1138,7 @@ cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ; - ## - cpu-flags gcc OPTIONS : x86 : atom : -march=atom ; - # Sparc --cpu-flags gcc OPTIONS : sparc : c3 : -mcpu=c3 : default ; --cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 ; -+cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ; - cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ; - cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ; - cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ; -diff --git a/src/tools/gcc.py b/src/tools/gcc.py -index a13ce7a..d2d3294 100644 ---- a/tools/build/src/tools/gcc.py -+++ b/tools/build/src/tools/gcc.py -@@ -789,8 +789,7 @@ cpu_flags('gcc', 'OPTIONS', 'x86', 'atom', ['-march=atom']) - # Sparc - flags('gcc', 'OPTIONS', ['sparc/32'], ['-m32']) - flags('gcc', 'OPTIONS', ['sparc/64'], ['-m64']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'c3', ['-mcpu=c3'], default=True) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7']) -+cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'], default=True) - cpu_flags('gcc', 'OPTIONS', 'sparc', 'cypress', ['-mcpu=cypress']) - cpu_flags('gcc', 'OPTIONS', 'sparc', 'v8', ['-mcpu=v8']) - cpu_flags('gcc', 'OPTIONS', 'sparc', 'supersparc', ['-mcpu=supersparc']) --- -2.3.6 - diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 80325b0a4e..efc0020fe2 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -89,6 +89,10 @@ BOOST_OPTS += toolset=gcc \ abi=$(BOOST_ABI) \ variant=$(if $(BR2_ENABLE_DEBUG),debug,release) +ifeq ($(BR2_sparc),y) +BOOST_OPTS += architecture=sparc instruction-set=v8 +endif + # By default, Boost build and installs both the shared and static # variants. Override that if we want static only or shared only. ifeq ($(BR2_STATIC_LIBS),y) From 5583d2dbfc15e7d4f059d7323db5d63c8b0ec5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Tue, 17 Nov 2015 18:20:45 +0100 Subject: [PATCH 047/132] readline: install configuration file from package recipe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /etc/inputrc is configuration file for readline. However, until now, it was provided by skeleton. This patch install /etc/inputrc from readline recipe. Signed-off-by: Jérôme Pouiller Acked-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- {system/skeleton/etc => package/readline}/inputrc | 0 package/readline/readline.mk | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) rename {system/skeleton/etc => package/readline}/inputrc (100%) diff --git a/system/skeleton/etc/inputrc b/package/readline/inputrc similarity index 100% rename from system/skeleton/etc/inputrc rename to package/readline/inputrc diff --git a/package/readline/readline.mk b/package/readline/readline.mk index c004899c23..3d3169627d 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -17,8 +17,12 @@ READLINE_LICENSE_FILES = COPYING define READLINE_PURGE_EXAMPLES rm -rf $(TARGET_DIR)/usr/share/readline endef - READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_PURGE_EXAMPLES +define READLINE_INSTALL_INPUTRC + $(INSTALL) -D -m 644 package/readline/inputrc $(TARGET_DIR)/etc/inputrc +endef +READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_INSTALL_INPUTRC + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From c3d65a4dad707db83122ac082202f3e8dc70e60f Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Sat, 14 Nov 2015 16:54:30 +0100 Subject: [PATCH 048/132] python3: add patch to fix PEP 3147 issue with automake built packages Packages built with automake use a `py-compile` helper to byte-compile Python source files. This script uses the "py_compile" module from the standard library. In turn, the compile() function in the "py_compile" module invokes the cache_from_source() function provided by importlib. This commit adds a new patch named "020-importlib-no-pep3147.patch" that changes cache_from_source() and source_from_cache() in importlib to get rid of the "__pycache__" directory. This commit fixes the following import error in kmod when the module is built for Python 3: >>> from kmod import Kmod Traceback (most recent call last): File "", line 1, in ImportError: cannot import name 'Kmod' Moreover, this commit removes two patches that are no longer necessary since modifying cache_from_source() and source_from_cache() disables PEP 3147 for the standard library and distutils / setuptools. * 004-old-stdlib-cache.patch * 016-distutils-no-pep3147.patch Signed-off-by: Christophe Vu-Brugier Signed-off-by: Thomas Petazzoni Tested-by: Thomas Petazzoni --- package/python3/004-old-stdlib-cache.patch | 78 ------------------- package/python3/005-pyc-pyo-conditional.patch | 8 +- .../python3/016-distutils-no-pep3147.patch | 36 --------- .../python3/020-importlib-no-pep3147.patch | 69 ++++++++++++++++ package/python3/python3.mk | 10 +++ 5 files changed, 83 insertions(+), 118 deletions(-) delete mode 100644 package/python3/004-old-stdlib-cache.patch delete mode 100644 package/python3/016-distutils-no-pep3147.patch create mode 100644 package/python3/020-importlib-no-pep3147.patch diff --git a/package/python3/004-old-stdlib-cache.patch b/package/python3/004-old-stdlib-cache.patch deleted file mode 100644 index 9ed7e59a9b..0000000000 --- a/package/python3/004-old-stdlib-cache.patch +++ /dev/null @@ -1,78 +0,0 @@ -python3: Fix pyc-only related runtime exceptions - -Python3 changes the pyc lookup strategy, ignoring the -__pycache__ directory if the .py file is missing. Change -install location to enable use of .pyc without their parent .py - -See http://www.python.org/dev/peps/pep-3147 - -Signed-off-by: Daniel Nelson - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -352,6 +352,23 @@ - AC_SUBST(FRAMEWORKUNIXTOOLSPREFIX) - AC_SUBST(FRAMEWORKINSTALLAPPSPREFIX) - -+STDLIB_CACHE_FLAGS= -+AC_MSG_CHECKING(for --enable-old-stdlib-cache) -+AC_ARG_ENABLE(old-stdlib-cache, -+ AS_HELP_STRING([--enable-old-stdlib-cache], [enable pre-pep3147 stdlib cache]), -+[ -+ if test "$enableval" = "yes" -+ then -+ STDLIB_CACHE_FLAGS="-b" -+ else -+ STDLIB_CACHE_FLAGS="" -+ fi -+], -+[ -+ STDLIB_CACHE_FLAGS="" -+]) -+AC_SUBST(STDLIB_CACHE_FLAGS) -+ - ##AC_ARG_WITH(dyld, - ## AS_HELP_STRING([--with-dyld], - ## [Use (OpenStep|Rhapsody) dynamic linker])) -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -162,6 +162,9 @@ - # Options to enable prebinding (for fast startup prior to Mac OS X 10.3) - OTHER_LIBTOOL_OPT=@OTHER_LIBTOOL_OPT@ - -+# Option to enable old-style precompiled stdlib -+STDLIB_CACHE_FLAGS=@STDLIB_CACHE_FLAGS@ -+ - # Environment to run shared python without installed libraries - RUNSHARED= @RUNSHARED@ - -@@ -1247,21 +1250,21 @@ - fi - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -- -d $(LIBDEST) -f \ -+ -d $(LIBDEST) -f $(STDLIB_CACHE_FLAGS) \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ -- -d $(LIBDEST) -f \ -+ -d $(LIBDEST) -f $(STDLIB_CACHE_FLAGS) \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -- -d $(LIBDEST)/site-packages -f \ -+ -d $(LIBDEST)/site-packages -f $(STDLIB_CACHE_FLAGS) \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ -- -d $(LIBDEST)/site-packages -f \ -+ -d $(LIBDEST)/site-packages -f $(STDLIB_CACHE_FLAGS) \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt diff --git a/package/python3/005-pyc-pyo-conditional.patch b/package/python3/005-pyc-pyo-conditional.patch index c3b159da76..0d60ff6949 100644 --- a/package/python3/005-pyc-pyo-conditional.patch +++ b/package/python3/005-pyc-pyo-conditional.patch @@ -9,27 +9,27 @@ Index: b/Makefile.pre.in +ifeq (@PYC_BUILD@,yes) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f $(STDLIB_CACHE_FLAGS) \ + -d $(LIBDEST) -f \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) +endif +ifeq (@PYO_BUILD@,yes) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f $(STDLIB_CACHE_FLAGS) \ + -d $(LIBDEST) -f \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) +endif +ifeq (@PYC_BUILD@,yes) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f $(STDLIB_CACHE_FLAGS) \ + -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +endif +ifeq (@PYO_BUILD@,yes) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f $(STDLIB_CACHE_FLAGS) \ + -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +endif -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ diff --git a/package/python3/016-distutils-no-pep3147.patch b/package/python3/016-distutils-no-pep3147.patch deleted file mode 100644 index 0fdfeb24ca..0000000000 --- a/package/python3/016-distutils-no-pep3147.patch +++ /dev/null @@ -1,36 +0,0 @@ -Add distutils fix for PEP 3147 issue - -Python 3 has a new standard for installing .pyc file, called PEP -3147. Unfortunately, this standard requires both the .py and .pyc -files to be installed for a Python module to be found. This is quite -annoying on space-constrained embedded systems, since the .py file is -technically not required for execution. - -For the Python standard library, our Python 3 package already contains -a patch named python3-004-old-stdlib-cache.patch, which allows to -disable the PEP 3147 installation. - -But that lives the distutils/setuptools package an unsolved -problem. This patch therefore adds a new patch to Python, which makes -distutils package use the traditional installation path when byte -compiling, rather than the PEP 3147 installation path. Since -setuptools relies on distutils internally, it also fixes setuptools -based packages. - -Signed-off-by: Thomas Petazzoni - -Index: b/Lib/distutils/util.py -=================================================================== ---- a/Lib/distutils/util.py -+++ b/Lib/distutils/util.py -@@ -437,7 +437,9 @@ - # Terminology from the py_compile module: - # cfile - byte-compiled file - # dfile - purported source filename (same as 'file' by default) -- if optimize >= 0: -+ if "_python_sysroot" in os.environ: -+ cfile = file + (__debug__ and "c" or "o") -+ elif optimize >= 0: - cfile = importlib.util.cache_from_source( - file, debug_override=not optimize) - else: diff --git a/package/python3/020-importlib-no-pep3147.patch b/package/python3/020-importlib-no-pep3147.patch new file mode 100644 index 0000000000..779b5e27c3 --- /dev/null +++ b/package/python3/020-importlib-no-pep3147.patch @@ -0,0 +1,69 @@ +Add importlib fix for PEP 3147 issue + +Python 3 has a new standard for installing .pyc file, called PEP +3147. Unfortunately, this standard requires both the .py and .pyc +files to be installed for a Python module to be found. This is quite +annoying on space-constrained embedded systems, since the .py file is +technically not required for execution. + +This patch changes cache_from_source() and source_from_cache() in +importlib to get rid of the "__pycache__" directory. +This effectively disables PEP 3147 for: + +* The python standard library +* Packages built with distutils or setuptools +* Packages built with automake that use the `py-compile` helper + +Signed-off-by: Christophe Vu-Brugier + +diff -purN a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py +--- a/Lib/importlib/_bootstrap.py 2015-02-25 12:27:44.000000000 +0100 ++++ b/Lib/importlib/_bootstrap.py 2015-08-27 17:33:26.167191059 +0200 +@@ -444,8 +444,6 @@ def cache_from_source(path, debug_overri + If debug_override is not None, then it must be a boolean and is used in + place of sys.flags.optimize. + +- If sys.implementation.cache_tag is None then NotImplementedError is raised. +- + """ + debug = not sys.flags.optimize if debug_override is None else debug_override + if debug: +@@ -454,33 +452,19 @@ def cache_from_source(path, debug_overri + suffixes = OPTIMIZED_BYTECODE_SUFFIXES + head, tail = _path_split(path) + base, sep, rest = tail.rpartition('.') +- tag = sys.implementation.cache_tag +- if tag is None: +- raise NotImplementedError('sys.implementation.cache_tag is None') +- filename = ''.join([(base if base else rest), sep, tag, suffixes[0]]) +- return _path_join(head, _PYCACHE, filename) ++ filename = ''.join([(base if base else rest), suffixes[0]]) ++ return _path_join(head, filename) + + + def source_from_cache(path): + """Given the path to a .pyc./.pyo file, return the path to its .py file. + + The .pyc/.pyo file does not need to exist; this simply returns the path to +- the .py file calculated to correspond to the .pyc/.pyo file. If path does +- not conform to PEP 3147 format, ValueError will be raised. If +- sys.implementation.cache_tag is None then NotImplementedError is raised. ++ the .py file calculated to correspond to the .pyc/.pyo file. + + """ +- if sys.implementation.cache_tag is None: +- raise NotImplementedError('sys.implementation.cache_tag is None') +- head, pycache_filename = _path_split(path) +- head, pycache = _path_split(head) +- if pycache != _PYCACHE: +- raise ValueError('{} not bottom-level directory in ' +- '{!r}'.format(_PYCACHE, path)) +- if pycache_filename.count('.') != 2: +- raise ValueError('expected only 2 dots in ' +- '{!r}'.format(pycache_filename)) +- base_filename = pycache_filename.partition('.')[0] ++ head, filename = _path_split(path) ++ base_filename = filename.partition('.')[0] + return _path_join(head, base_filename + SOURCE_SUFFIXES[0]) + + diff --git a/package/python3/python3.mk b/package/python3/python3.mk index fd5709a92e..a37b791a87 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -147,7 +147,17 @@ define PYTHON3_TOUCH_GRAMMAR_FILES touch $(@D)/Include/graminit.h $(@D)/Python/graminit.c endef +# This prevents the Python Makefile from regenerating the +# Python/importlib.h header if Lib/importlib/_bootstrap.py has changed +# because its generation is broken in a cross-compilation environment +# and importlib.h is not used. + +define PYTHON3_TOUCH_IMPORTLIB_H + touch $(@D)/Python/importlib.h +endef + PYTHON3_POST_PATCH_HOOKS += PYTHON3_TOUCH_GRAMMAR_FILES +PYTHON3_POST_PATCH_HOOKS += PYTHON3_TOUCH_IMPORTLIB_H # # Remove useless files. In the config/ directory, only the Makefile From 8715e18e9327cbde4e6b30cfab3982138b727e56 Mon Sep 17 00:00:00 2001 From: Ray Kinsella Date: Tue, 17 Nov 2015 16:38:50 +0000 Subject: [PATCH 049/132] board: add support for Intel Galileo Gen 2 Board support package includes: * Toplevel build root configuration * Github based 3.8.7 Kernel * Upstream 3.8.7 * Linux 3.8.7 Kernel Driver Patches * Linux 3.8.7 configuration * Grub configuration * Init Script to load modules * genimage config to create sdcard image. [Thomas: simplify post-image script since there is now only one call to genimage.] Signed-off-by: Ray Kinsella Signed-off-by: Thomas Petazzoni --- board/intel/galileo/genimage.cfg | 31 ++ board/intel/galileo/grub.cfg | 11 + board/intel/galileo/linux-3.8.config | 307 ++++++++++++++++++ board/intel/galileo/post-build.sh | 2 + board/intel/galileo/post-image.sh | 13 + .../rootfs_overlay/etc/init.d/S09modload | 33 ++ .../etc/modules-load.galileo/galileo.conf | 3 + .../modules-load.galileo/galileo_gen2.conf | 4 + configs/galileo_defconfig | 25 ++ 9 files changed, 429 insertions(+) create mode 100644 board/intel/galileo/genimage.cfg create mode 100644 board/intel/galileo/grub.cfg create mode 100644 board/intel/galileo/linux-3.8.config create mode 100755 board/intel/galileo/post-build.sh create mode 100755 board/intel/galileo/post-image.sh create mode 100755 board/intel/galileo/rootfs_overlay/etc/init.d/S09modload create mode 100644 board/intel/galileo/rootfs_overlay/etc/modules-load.galileo/galileo.conf create mode 100644 board/intel/galileo/rootfs_overlay/etc/modules-load.galileo/galileo_gen2.conf create mode 100644 configs/galileo_defconfig diff --git a/board/intel/galileo/genimage.cfg b/board/intel/galileo/genimage.cfg new file mode 100644 index 0000000000..31add21e67 --- /dev/null +++ b/board/intel/galileo/genimage.cfg @@ -0,0 +1,31 @@ +# Create an image of the efi partition +image efi-part.vfat { + vfat { + file startup.nsh { + image = "efi-part/startup.nsh" + } + file EFI { + image = "efi-part/EFI" + } + } + size=512K +} + +# Create the sdcard image, pulling in +# * the image created by buildroot +# * the efi-partition created above +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "efi-part.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + size = 512M + } +} diff --git a/board/intel/galileo/grub.cfg b/board/intel/galileo/grub.cfg new file mode 100644 index 0000000000..dde2f762f0 --- /dev/null +++ b/board/intel/galileo/grub.cfg @@ -0,0 +1,11 @@ +set default="0" +set timeout="0" + +menuentry "Buildroot" { + # Grub2 supports ext4, load the kernel from the Linux rootfs partition + # Set root tells grub to search the 2nd partition for the bzImage + set root=(hd0,msdos2) + + # Set Linux to boot from the 2nd partition, SD/MMC support is baked into the kernel + linux /boot/bzImage root=/dev/mmcblk0p2 rootwait console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x9000b000,115200n8 reboot=efi,warm apic=debug rw +} diff --git a/board/intel/galileo/linux-3.8.config b/board/intel/galileo/linux-3.8.config new file mode 100644 index 0000000000..961f0f8864 --- /dev/null +++ b/board/intel/galileo/linux-3.8.config @@ -0,0 +1,307 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_KERNEL_LZMA=y +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=18 +CONFIG_CGROUPS=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CPUSETS=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_RESOURCE_COUNTERS=y +CONFIG_CGROUP_SCHED=y +CONFIG_NAMESPACES=y +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS_ALL=y +# CONFIG_PCSPKR_PLATFORM is not set +CONFIG_EMBEDDED=y +# CONFIG_COMPAT_BRK is not set +CONFIG_JUMP_LABEL=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_LBDAF is not set +CONFIG_PARTITION_ADVANCED=y +CONFIG_BSD_DISKLABEL=y +# CONFIG_EFI_PARTITION is not set +# CONFIG_ZONE_DMA is not set +CONFIG_INTEL_QUARK_X1000_SOC=y +CONFIG_M586TSC=y +CONFIG_X86_GENERIC=y +CONFIG_HPET_TIMER=y +CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_X86_UP_APIC=y +CONFIG_X86_UP_IOAPIC=y +# CONFIG_X86_MCE_AMD is not set +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_MICROCODE=y +CONFIG_X86_MSR=y +CONFIG_X86_CPUID=y +CONFIG_HIGHMEM64G=y +# CONFIG_COMPACTION is not set +# CONFIG_MTRR is not set +# CONFIG_ARCH_RANDOM is not set +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_EFI_CAPSULE=m +CONFIG_HZ_100=y +CONFIG_KEXEC=y +CONFIG_PHYSICAL_START=0x400000 +# CONFIG_RELOCATABLE is not set +# CONFIG_COMPAT_VDSO is not set +CONFIG_PM_RUNTIME=y +CONFIG_PM_DEBUG=y +CONFIG_PM_TRACE_RTC=y +CONFIG_ACPI_PROCFS=y +CONFIG_ACPI_PROCFS_POWER=y +CONFIG_ACPI_EC_DEBUGFS=y +# CONFIG_ACPI_PROC_EVENT is not set +# CONFIG_ACPI_BATTERY is not set +# CONFIG_ACPI_FAN is not set +CONFIG_ACPI_DEBUG=y +CONFIG_ACPI_PCI_SLOT=y +CONFIG_PCIEPORTBUS=y +CONFIG_PCI_MSI=y +CONFIG_PCI_DEBUG=y +CONFIG_PCI_IOAPIC=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_SYN_COOKIES=y +# CONFIG_IPV6_SIT is not set +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_J1939=m +CONFIG_CAN_VCAN=m +CONFIG_CAN_SLCAN=m +# CONFIG_CAN_DEV is not set +CONFIG_BT=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIVHCI=m +CONFIG_CFG80211=m +CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=m +CONFIG_RFKILL=m +CONFIG_RFKILL_INPUT=y +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_DEBUG_DEVRES=y +CONFIG_MTD=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_M25P80=y +# CONFIG_PNP_DEBUG_MESSAGES is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=2 +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=1 +CONFIG_BLK_DEV_RAM_SIZE=81920 +CONFIG_EEPROM_AT24=m +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_SG=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_SPI_ATTRS=y +# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_NETDEVICES=y +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_ADAPTEC is not set +# CONFIG_NET_VENDOR_ALTEON is not set +# CONFIG_NET_VENDOR_AMD is not set +# CONFIG_NET_VENDOR_ATHEROS is not set +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_BROCADE is not set +# CONFIG_NET_VENDOR_CHELSIO is not set +# CONFIG_NET_VENDOR_CISCO is not set +# CONFIG_NET_VENDOR_DEC is not set +# CONFIG_NET_VENDOR_DLINK is not set +# CONFIG_NET_VENDOR_EMULEX is not set +# CONFIG_NET_VENDOR_EXAR is not set +# CONFIG_NET_VENDOR_HP is not set +CONFIG_E1000=m +# CONFIG_NET_VENDOR_I825XX is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MELLANOX is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MICROCHIP is not set +# CONFIG_NET_VENDOR_MYRI is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_NVIDIA is not set +# CONFIG_NET_VENDOR_OKI is not set +# CONFIG_NET_PACKET_ENGINE is not set +# CONFIG_NET_VENDOR_QLOGIC is not set +# CONFIG_NET_VENDOR_REALTEK is not set +# CONFIG_NET_VENDOR_RDC is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SILAN is not set +# CONFIG_NET_VENDOR_SIS is not set +# CONFIG_NET_VENDOR_SMSC is not set +CONFIG_STMMAC_ETH=y +# CONFIG_STMMAC_PLATFORM is not set +CONFIG_STMMAC_PCI=y +CONFIG_STMMAC_DA=y +# CONFIG_NET_VENDOR_SUN is not set +# CONFIG_NET_VENDOR_TEHUTI is not set +# CONFIG_NET_VENDOR_TI is not set +# CONFIG_NET_VENDOR_VIA is not set +# CONFIG_NET_VENDOR_WIZNET is not set +CONFIG_PPP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_ASYNC=m +CONFIG_IWLWIFI=m +# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_LEGACY_PTY_COUNT=32 +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_PNP is not set +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_PCI is not set +CONFIG_SERIAL_8250_NR_UARTS=8 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y +CONFIG_SERIAL_8250_DW=y +# CONFIG_HW_RANDOM is not set +CONFIG_HPET=y +# CONFIG_HPET_MMAP is not set +CONFIG_I2C_CHARDEV=y +CONFIG_SPI_DEBUG=y +CONFIG_SPI_GPIO=y +CONFIG_SPI_PXA2XX=y +CONFIG_SPI_PXA2XX_PCI=y +CONFIG_SPI_SPIDEV=y +CONFIG_PTP_1588_CLOCK_PCH=m +CONFIG_GPIO_SCH=m +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCA953X_IRQ=y +# CONFIG_HWMON is not set +CONFIG_MFD_INTEL_QUARK_HSUART_DMA=y +CONFIG_CY8C9540A=m +CONFIG_MFD_PCA9685=m +CONFIG_INTEL_QRK_GIP=m +CONFIG_INTEL_QRK_GIP_TEST=m +CONFIG_LPC_SCH=y +CONFIG_MEDIA_SUPPORT=m +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_USB_SUPPORT=y +CONFIG_USB_VIDEO_CLASS=m +# CONFIG_USB_GSPCA is not set +# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set +# CONFIG_DVB_AU8522_V4L is not set +# CONFIG_DVB_TUNER_DIB0070 is not set +# CONFIG_DVB_TUNER_DIB0090 is not set +# CONFIG_VGA_ARB is not set +# CONFIG_VGA_CONSOLE is not set +CONFIG_SOUND=m +CONFIG_SND=m +CONFIG_SND_USB_AUDIO=m +CONFIG_USB=m +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_ACM=m +CONFIG_USB_STORAGE=m +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_GADGET=m +CONFIG_USB_EG20T=m +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_G_ACM_MS=m +CONFIG_MMC=y +CONFIG_MMC_UNSAFE_RESUME=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PCI=y +CONFIG_MMC_SDHCI_ACPI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_RTC_CLASS=y +CONFIG_DMADEVICES=y +CONFIG_DW_DMAC=y +CONFIG_UIO=y +CONFIG_STAGING=y +CONFIG_MAX78M6610_LMU=m +CONFIG_IIO_SYSFS_TRIGGER=m +CONFIG_IIO_HRTIMER_TRIGGER=m +# CONFIG_NET_VENDOR_SILICOM is not set +CONFIG_INTEL_QRK_ESRAM=y +CONFIG_INTEL_QRK_THERMAL=y +CONFIG_INTEL_QRK_AUDIO_CTRL=m +CONFIG_INTEL_QRK_J1708=m +# CONFIG_IOMMU_SUPPORT is not set +CONFIG_IIO=y +CONFIG_IIO_BUFFER_CB=y +CONFIG_IIO_LIS331DLH_INTEL_QRK=y +CONFIG_AD7298=m +CONFIG_ADC1x8S102=m +CONFIG_PWM=y +CONFIG_EFI_VARS=m +CONFIG_DMI_SYSFS=y +CONFIG_EXT4_FS=y +# CONFIG_EXT4_USE_FOR_EXT23 is not set +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_VFAT_FS=y +CONFIG_PROC_KCORE=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_HUGETLBFS=y +# CONFIG_MISC_FILESYSTEMS is not set +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_PRINTK_TIME=y +# CONFIG_ENABLE_WARN_DEPRECATED is not set +CONFIG_FRAME_WARN=2048 +CONFIG_MAGIC_SYSRQ=y +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_HEADERS_CHECK=y +# CONFIG_SCHED_DEBUG is not set +CONFIG_TIMER_STATS=y +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_FTRACE is not set +CONFIG_DEBUG_STACKOVERFLOW=y +CONFIG_X86_PTDUMP=y +# CONFIG_DEBUG_RODATA_TEST is not set +CONFIG_DEBUG_SET_MODULE_RONX=y +# CONFIG_DOUBLEFAULT is not set +CONFIG_DEBUG_BOOT_PARAMS=y +CONFIG_OPTIMIZE_INLINING=y +CONFIG_KEYS=y +CONFIG_KEYS_DEBUG_PROC_KEYS=y +CONFIG_SECURITY=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_CRYPTO_HW is not set +# CONFIG_VIRTUALIZATION is not set diff --git a/board/intel/galileo/post-build.sh b/board/intel/galileo/post-build.sh new file mode 100755 index 0000000000..2b34cb43b8 --- /dev/null +++ b/board/intel/galileo/post-build.sh @@ -0,0 +1,2 @@ +#!/bin/sh -e +cp board/intel/galileo/grub.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg diff --git a/board/intel/galileo/post-image.sh b/board/intel/galileo/post-image.sh new file mode 100755 index 0000000000..f9aef0b1ba --- /dev/null +++ b/board/intel/galileo/post-image.sh @@ -0,0 +1,13 @@ +#!/bin/sh -e + +GENIMAGE_CFG="board/intel/galileo/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}" diff --git a/board/intel/galileo/rootfs_overlay/etc/init.d/S09modload b/board/intel/galileo/rootfs_overlay/etc/init.d/S09modload new file mode 100755 index 0000000000..359d607c18 --- /dev/null +++ b/board/intel/galileo/rootfs_overlay/etc/init.d/S09modload @@ -0,0 +1,33 @@ +#!/bin/sh +# + +load_drivers() +{ + while IFS= read -r line; do + modprobe $line + done < "/etc/modules-load.galileo/$1.conf" +} + +do_board() +{ + board=$(cat /sys/devices/virtual/dmi/id/board_name) + case "$board" in + *"GalileoGen2" ) + load_drivers "galileo_gen2" ;; + *"Galileo" ) + load_drivers "galileo" ;; + esac +} + +case "$1" in + start) + do_board + ;; + stop) + ;; + restart|reload) + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac diff --git a/board/intel/galileo/rootfs_overlay/etc/modules-load.galileo/galileo.conf b/board/intel/galileo/rootfs_overlay/etc/modules-load.galileo/galileo.conf new file mode 100644 index 0000000000..b658261946 --- /dev/null +++ b/board/intel/galileo/rootfs_overlay/etc/modules-load.galileo/galileo.conf @@ -0,0 +1,3 @@ +intel_qrk_gip +cy8c9540a +ad7298 diff --git a/board/intel/galileo/rootfs_overlay/etc/modules-load.galileo/galileo_gen2.conf b/board/intel/galileo/rootfs_overlay/etc/modules-load.galileo/galileo_gen2.conf new file mode 100644 index 0000000000..4f80a3301f --- /dev/null +++ b/board/intel/galileo/rootfs_overlay/etc/modules-load.galileo/galileo_gen2.conf @@ -0,0 +1,4 @@ +intel_qrk_gip +gpio-pca953x +pca9685 +adc1x8s102 diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig new file mode 100644 index 0000000000..95ddfc159c --- /dev/null +++ b/configs/galileo_defconfig @@ -0,0 +1,25 @@ +BR2_x86_x1000=y +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.8" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_8=y +# Binutils 2.25 is required as this enables stripping the LOCK prefix +BR2_BINUTILS_VERSION_2_25_X=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" +BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y +BR2_ROOTFS_OVERLAY="board/intel/galileo/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/intel/galileo/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/intel/galileo/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/mdr78/Linux-x1000.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="d1a51d55dc67022be6c2d15163ce6dd28540042f" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/intel/galileo/linux-3.8.config" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_I386_EFI=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From ec069dcf54cc69c19701a69106acaffdd07023bf Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 13 Nov 2015 16:41:37 -0300 Subject: [PATCH 050/132] gcr: new package [Thomas: add explicit --with-gtk when gtk is available.] Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/gcr/Config.in | 19 +++++++++++++++++++ package/gcr/gcr.hash | 2 ++ package/gcr/gcr.mk | 29 +++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+) create mode 100644 package/gcr/Config.in create mode 100644 package/gcr/gcr.hash create mode 100644 package/gcr/gcr.mk diff --git a/package/Config.in b/package/Config.in index 39a5af7fb8..3656c54c3d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -751,6 +751,7 @@ menu "Crypto" source "package/botan/Config.in" source "package/ca-certificates/Config.in" source "package/cryptodev/Config.in" + source "package/gcr/Config.in" source "package/gnutls/Config.in" source "package/libassuan/Config.in" source "package/libgcrypt/Config.in" diff --git a/package/gcr/Config.in b/package/gcr/Config.in new file mode 100644 index 0000000000..cd40ca18f6 --- /dev/null +++ b/package/gcr/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_GCR + bool "gcr" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on !BR2_STATIC_LIBS # p11-kit + select BR2_PACKAGE_GNUPG2 # runtime + select BR2_PACKAGE_LIBGCRYPT + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_P11_KIT + help + Library for cryptographic UIs and accessing PKCS#11 modules. + + https://developer.gnome.org/gcr/ + +comment "gcr needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/gcr/gcr.hash b/package/gcr/gcr.hash new file mode 100644 index 0000000000..8f1f931c0d --- /dev/null +++ b/package/gcr/gcr.hash @@ -0,0 +1,2 @@ +# From http://ftp.acc.umu.se/pub/gnome/sources/gcr/3.18/gcr-3.18.0.sha256sum +sha256 d4d16da5af55148a694055835ccd07ad34daf0ad03bdad929bf7cad15637ce00 gcr-3.18.0.tar.xz diff --git a/package/gcr/gcr.mk b/package/gcr/gcr.mk new file mode 100644 index 0000000000..0730eb442f --- /dev/null +++ b/package/gcr/gcr.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# gcr +# +################################################################################ + +GCR_VERSION_MAJOR = 3.18 +GCR_VERSION = $(GCR_VERSION_MAJOR).0 +GCR_SITE = http://ftp.acc.umu.se/pub/gnome/sources/gcr/$(GCR_VERSION_MAJOR) +GCR_SOURCE = gcr-$(GCR_VERSION).tar.xz +GCR_DEPENDENCIES = host-pkgconf libgcrypt libglib2 p11-kit +GCR_INSTALL_STAGING = YES +GCR_CONF_ENV = ac_cv_path_GNUPG=/usr/bin/gpg2 +GCR_CONF_OPTS = \ + --disable-gtk-doc \ + --with-libgcrypt-prefix=$(STAGING_DIR)/usr +# Even though COPYING is v2 the code states v2.1+ +GCR_LICENSE = LGPLv2.1+ +GCR_LICENSE_FILES = COPYING + +# Only the X11 backend is supported for the simple GUI +ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) +GCR_DEPENDENCIES += libgtk3 +GCR_CONF_OPTS += --with-gtk +else +GCR_CONF_OPTS += --without-gtk +endif + +$(eval $(autotools-package)) From c20fccf3514abb727cc733b1bf809024ada01103 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 18 Nov 2015 13:03:10 -0300 Subject: [PATCH 051/132] dbus: bump to version 1.10.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/dbus/dbus.hash | 2 +- package/dbus/dbus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 7e21dd0270..87efd4bdcd 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 aef3f49595df09b0824433ee993cda748ede93693a719a831562ae1616b6bb9e dbus-1.10.2.tar.gz +sha256 ad7dcad73ad9b0ff55819985d354eacfffe07e2eb8c763e155efc21d6001084b dbus-1.10.4.tar.gz diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 9e722d8fdf..79cd678f16 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.10.2 +DBUS_VERSION = 1.10.4 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFLv2.1 GPLv2+ DBUS_LICENSE_FILES = COPYING From d8566397dbc267320b2f989e32b90159787c6394 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 18 Nov 2015 13:03:41 -0300 Subject: [PATCH 052/132] nano: bump to version 2.4.3 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 8ad14978f5..c9241519c7 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 c8cd7f18fcf5696d9df3364ee2a840e0ab7b6bdbd22abf850bbdc951db7f65b9 nano-2.4.2.tar.gz +sha256 32d627072b6026678e4f4095c047adec92ac7ec542dd6d91cf27f49b601768f2 nano-2.4.3.tar.gz diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 9b844905d2..28161f3478 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -4,7 +4,7 @@ # ################################################################################ -NANO_VERSION = 2.4.2 +NANO_VERSION = 2.4.3 NANO_SITE = $(BR2_GNU_MIRROR)/nano NANO_LICENSE = GPLv3+ NANO_LICENSE_FILES = COPYING From 462b1cbfa68eba1bae0d4d732aeefdf3308ecae0 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 18 Nov 2015 21:38:39 +0200 Subject: [PATCH 053/132] package/*: test for BR2_PACKAGE_LIBGUDEV for dependency Make the case of adding libgudev as a dependency more consistent with all other dependency packages. The _DEPENDENCIES variable sets the build order which is conceptually independent of the underlying reason for that dependency. Also, remove the comments in hidapi.mk and udisks.mk. These comments explain why BR2_PACKAGE_LIBGUDEV is selected, so the comments in corresponding Config.in files are enough. Cc: Vicente Olivert Riera Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/hidapi/hidapi.mk | 7 +------ package/libmbim/libmbim.mk | 2 +- package/modem-manager/modem-manager.mk | 2 +- package/network-manager/network-manager.mk | 2 +- package/udisks/udisks.mk | 7 +------ 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/package/hidapi/hidapi.mk b/package/hidapi/hidapi.mk index 2457554748..eb5d5c3556 100644 --- a/package/hidapi/hidapi.mk +++ b/package/hidapi/hidapi.mk @@ -16,12 +16,7 @@ HIDAPI_LICENSE_FILES = LICENSE.txt LICENSE-gpl3.txt LICENSE-bsd.txt LICENSE-orig HIDAPI_DEPENDENCIES = libusb -# When eudev is used as the udev provider, libgudev is automatically -# provided as it is part of eudev. However, when systemd is used as -# the udev provider, libgudev is not provided, and needs to be built -# separately. This is why we depend on the libgudev package only if -# systemd is used. -ifeq ($(BR2_INIT_SYSTEMD),y) +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) HIDAPI_DEPENDENCIES += libgudev endif diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index cfba08e7e3..cb6c9055cc 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -13,7 +13,7 @@ LIBMBIM_INSTALL_STAGING = YES LIBMBIM_DEPENDENCIES = libglib2 udev -ifeq ($(BR2_INIT_SYSTEMD),y) +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) LIBMBIM_DEPENDENCIES += libgudev endif diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index f38dee36bc..6d8dc10d90 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -12,7 +12,7 @@ MODEM_MANAGER_LICENSE_FILES = COPYING MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool MODEM_MANAGER_INSTALL_STAGING = YES -ifeq ($(BR2_INIT_SYSTEMD),y) +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) MODEM_MANAGER_DEPENDENCIES += libgudev endif diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 2c19a7de0f..f2fe1477b0 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -63,7 +63,7 @@ ifeq ($(BR2_PACKAGE_DHCPCD),y) NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd endif -ifeq ($(BR2_INIT_SYSTEMD),y) +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) NETWORK_MANAGER_DEPENDENCIES += libgudev endif diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk index bea94522a6..eccfbd25b0 100644 --- a/package/udisks/udisks.mk +++ b/package/udisks/udisks.mk @@ -22,12 +22,7 @@ UDISKS_DEPENDENCIES = \ UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages -# When eudev is used as the udev provider, libgudev is automatically -# provided as it is part of eudev. However, when systemd is used as the -# udev provider, libgudev is not provided, and needs to be built -# separately. This is why we select the libgudev package only if systemd -# is used. -ifeq ($(BR2_PACKAGE_SYSTEMD),y) +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) UDISKS_DEPENDENCIES += libgudev endif From a6bd7ec38d5edccc4f574e667a4ff9bc2af1c62f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 18 Nov 2015 21:38:40 +0200 Subject: [PATCH 054/132] udisks: make libgudev selection consistent In all other package the condition for BR2_PACKAGE_LIBGUDEV selection is BR2_INIT_SYSTEMD. Do the same for udisks. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/udisks/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/udisks/Config.in b/package/udisks/Config.in index f24df03ab7..c9664afdf8 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_UDISKS # the udev provider, libgudev is not provided, and needs to be built # separately. This is why we select the libgudev package only if # systemd is used. - select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD help The udisks project provides From 167cda0facfa0cc4a912956e618c466a87b3c274 Mon Sep 17 00:00:00 2001 From: Ray Kinsella Date: Wed, 18 Nov 2015 13:13:44 +0000 Subject: [PATCH 055/132] board: readme.txt for Intel Galileo Gen 1/2 Created a readme.txt for the Intel Galileo Gen 1/2 that describes, * How to build for the Intel Galileo Gen 1/2 * How to access the console on the Intel Galileo Gen 1/2 Signed-off-by: Ray Kinsella Signed-off-by: Thomas Petazzoni --- board/intel/galileo/readme.txt | 52 ++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 board/intel/galileo/readme.txt diff --git a/board/intel/galileo/readme.txt b/board/intel/galileo/readme.txt new file mode 100644 index 0000000000..7a3abd4f71 --- /dev/null +++ b/board/intel/galileo/readme.txt @@ -0,0 +1,52 @@ + +Intel Galileo Gen 1/2 + +Intro +============ + +These instructions apply to both the Intel Galileo Gen 1/2 development boards +based on the Intel Quark X1000. + +How to build +============ + +Apply the defconfig for the Intel Galileo Gen 1/2 + + $ make galileo_defconfig + +Add any additional packages required and build. + + $ make + +The build process will create a SD card image and place it in output/images. + + $ ls -lh output/images/sdcard.img + -rw-r--r--. 1 foo foo 11M Nov 17 16:19 output/images/sdcard.img + +Write the image to an mSD card, insert into the Galileo and power on. + + $ dd if=output/images/sdcard.img of=/dev/mmcblk0; sync + +Accessing the console +===================== + +During power-on the console will become available on the Galileo's ttyS1. This +may be accessed as follows. + + * Galileo Gen 1 + + http://clayskits.com/products/galileo-gen-1-serial-cable + + A USB to RS-232 to 3.5mm Jack cable is required. Connect to the 3.5mm + Jack next to the Ethernet Header. + + * Galileo Gen 2 + + http://www.ftdichip.com/Products/Cables/USBTTLSerial.htm + + A FTDI TTL-232R-3V3 cable may be used to connect to the FTDI header + next to the Ethernet connector on the Galileo Gen 2. + +The console should now be visible at 115200 baud. + + $ picocom -b 115200 /dev/ttyUSB0 From b981df4fcee131b19c8f3e06489485346d38e942 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Wed, 18 Nov 2015 20:47:29 +1300 Subject: [PATCH 056/132] syslog-ng: Bump version to 3.7.2 Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- package/syslog-ng/syslog-ng.hash | 8 +------- package/syslog-ng/syslog-ng.mk | 9 +-------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index fed2475097..0213d2dadc 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,8 +1,2 @@ # Locally computed -sha256 4c19841b9079b377cd814b1e6ebbf273af41d04d51c648f4c31f19bfadc20220 syslog-ng-3.7.1.tar.gz -sha256 ca6b18c00e72a531dc3e4da24ff79e4b4420cb0f666b3d72af6597648b36a696 7b2b673ae2640ce9ad396f538fc25acb6e4405ec.patch -sha256 77fcbe7d6df23e710a81d8e065e17ab91b14d580aead65bb292e4f25b4369192 f10941e565d402e032948bb9711bfbab43eadd88.patch -sha256 4547b44d8241be716f321d2aed225197e517db9912d6aedd8565765b427db6f2 96a633ce3f46ed102f38115000730bad41c4ed65.patch -sha256 15cdd963f5cae0e113724fb202baccc0056f8618723d7f7290f15e082f9e16cd 00526014247bb63680e53c35d4a76d0dac989405.patch -sha256 ec76ed27ab01f9487a8adf092655bc99167a9e81f6be685a8a45fdb1b07cca32 46b07ecaffc154aa7cc713409196020736fe4f33.patch -sha256 737b34b4457a1fa9cd38be6a98119f131f7d64e82480011880c178d3d2618dea e30fe7c3717a7bda4036448c7777747df1a4e0f9.patch +sha256 b1b3ccc0ce7f0d8bf15b23e59f2f4f5ded70eed410dfd27105219bc8856388a5 syslog-ng-3.7.2.tar.gz diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index 1f51e0484e..5f48a79168 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSLOG_NG_VERSION = 3.7.1 +SYSLOG_NG_VERSION = 3.7.2 SYSLOG_NG_SOURCE = syslog-ng-$(SYSLOG_NG_VERSION).tar.gz SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPLv2.1+ (syslog-ng core), GPLv2+ (modules) @@ -14,13 +14,6 @@ SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \ # rabbit-mq needs -lrt SYSLOG_NG_CONF_ENV = LIBS=-lrt SYSLOG_NG_CONF_OPTS = --disable-manpages -SYSLOG_NG_PATCH = \ - https://github.com/balabit/syslog-ng/commit/7b2b673ae2640ce9ad396f538fc25acb6e4405ec.patch \ - https://github.com/balabit/syslog-ng/commit/f10941e565d402e032948bb9711bfbab43eadd88.patch \ - https://github.com/balabit/syslog-ng/commit/96a633ce3f46ed102f38115000730bad41c4ed65.patch \ - https://github.com/balabit/syslog-ng/commit/00526014247bb63680e53c35d4a76d0dac989405.patch \ - https://github.com/balabit/syslog-ng/commit/46b07ecaffc154aa7cc713409196020736fe4f33.patch \ - https://github.com/balabit/syslog-ng/commit/e30fe7c3717a7bda4036448c7777747df1a4e0f9.patch # We override busybox's S01logging init script ifeq ($(BR2_PACKAGE_BUSYBOX),y) From 71c75a5ea0e62786d279ef1609f23732bde5acc3 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Mon, 9 Nov 2015 22:16:49 +0000 Subject: [PATCH 057/132] system: Fix for NFS booting with interface config via DHCP Configuring the network interface with DHCP via /etc/network/interfaces generally does not work when NFS booting. The DHCP configuration will initially bring the interface down and system then hangs at that point as the root filesystem is no longer accessable. This adds a script to be run via a pre-up line in /etc/network/interfaces. It checks for a NFS root filesystem and if the interface to be configured is used for access to the NFS server. If this is the case, then it returns a failure code so that ifup will not configure the interface. This works for DHCP and another config methods (static, bootp, etc.). This system does detect if the interface to be configured isn't the one used for NFS and doesn't skip it when that is the case. NFS filesystems that aren't the root fs aren't considered. Fixes bug #4790. Signed-off-by: Trent Piepho Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/skeleton/nfs_check | 20 ++++++++++++++++++++ package/skeleton/skeleton.mk | 3 +++ 2 files changed, 23 insertions(+) create mode 100755 package/skeleton/nfs_check diff --git a/package/skeleton/nfs_check b/package/skeleton/nfs_check new file mode 100755 index 0000000000..dfa0cbf580 --- /dev/null +++ b/package/skeleton/nfs_check @@ -0,0 +1,20 @@ +#!/bin/sh + +# This allows NFS booting to work while also being able to configure +# the network interface via DHCP when not NFS booting. Otherwise, a +# NFS booted system will likely hang during DHCP configuration. + +# Attempting to configure the network interface used for NFS will +# initially bring that network down. Since the root filesystem is +# accessed over this network, the system hangs. + +# This script is run by ifup and will attempt to detect if a NFS root +# mount uses the interface to be configured (IFACE), and if so does +# not configure it. This should allow the same build to be disk/flash +# booted or NFS booted. + +nfsip=`sed -n '/^[^ ]*:.* \/ nfs.*[ ,]addr=\([0-9.]\+\).*/s//\1/p' /proc/mounts` +if [ -n "$nfsip" ] && ip route get to "$nfsip" | grep -q "dev $IFACE"; then + echo Skipping $IFACE, used for NFS from $nfsip + exit 1 +fi diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index d1b797ddcf..0cab8a13f1 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -89,8 +89,11 @@ define SET_NETWORK_DHCP echo ; \ echo "auto $(NETWORK_DHCP_IFACE)"; \ echo "iface $(NETWORK_DHCP_IFACE) inet dhcp"; \ + echo " pre-up /etc/network/nfs_check"; \ echo " wait-delay 15"; \ ) >> $(TARGET_DIR)/etc/network/interfaces + $(INSTALL) -m 0755 -D $(SKELETON_PKGDIR)/nfs_check \ + $(TARGET_DIR)/etc/network/nfs_check endef endif From 0d62de9df75b1a01b62cb8492a60340ec167523d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 19 Nov 2015 13:47:09 -0300 Subject: [PATCH 058/132] harfbuzz: bump to version 1.1.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- 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 6dddf8d96f..3772242ef8 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.0.6.tar.bz2.sha256 -sha256 f616a7fbdc78a627043f9029000bf08c0c71df59cde4143fc92a014f6a993b26 harfbuzz-1.0.6.tar.bz2 +# From http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.1.0.tar.bz2.sha256 +sha256 0f584a5947e60ede565e7a4e122baa5e4b17a62eab872abf5f73d8552ceb716b harfbuzz-1.1.0.tar.bz2 diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 48ff3096cb..703e15cc0d 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 1.0.6 +HARFBUZZ_VERSION = 1.1.0 HARFBUZZ_SITE = http://www.freedesktop.org/software/harfbuzz/release HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 6cf1554e715222cdfb1fdc6d478f274b353e62e9 Mon Sep 17 00:00:00 2001 From: James Knight Date: Wed, 18 Nov 2015 16:36:35 -0500 Subject: [PATCH 059/132] chrony: bump to version 2.2 With the new version, documentation is not generated part of the main build. This removes the need to alter the Makefile to remove the invoke on the `chrony.txt` target. Cleanup also explicitly disabling seccomp (since its experimental) and tomcrypt (Buildroot does not have libtomcrypt at this time). [Thomas: use tabs for indentation in the definition of CHRONY_CONF_OPTS.] Signed-off-by: James Knight Signed-off-by: Thomas Petazzoni --- package/chrony/chrony.hash | 6 +++--- package/chrony/chrony.mk | 15 +++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/package/chrony/chrony.hash b/package/chrony/chrony.hash index ba7f95e50f..066ecb50bd 100644 --- a/package/chrony/chrony.hash +++ b/package/chrony/chrony.hash @@ -1,3 +1,3 @@ -# From http://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2014/09/msg00000.html -md5 04ab702fc81150db06809562a9aaed92 chrony-1.31.tar.gz -sha1 71bb46cad2f15760192795e60efdf23069973908 chrony-1.31.tar.gz +# From http://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2015/10/msg00002.html +md5 17bc77d3d2ce942675f9600b60452717 chrony-2.2.tar.gz +sha1 eed81b53ef504430128a3a6fa5b56f7ee2fdf2b1 chrony-2.2.tar.gz diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 72c4c4bb6c..aa7306f32f 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -4,12 +4,17 @@ # ################################################################################ -CHRONY_VERSION = 1.31 +CHRONY_VERSION = 2.2 CHRONY_SITE = http://download.tuxfamily.org/chrony CHRONY_LICENSE = GPLv2 CHRONY_LICENSE_FILES = COPYING -CHRONY_CONF_OPTS = --host-system=Linux --host-machine=$(BR2_ARCH) --prefix=/usr +CHRONY_CONF_OPTS = \ + --host-system=Linux \ + --host-machine=$(BR2_ARCH) \ + --prefix=/usr \ + --without-seccomp \ + --without-tomcrypt ifeq ($(BR2_PACKAGE_LIBNSS),y) CHRONY_DEPENDENCIES += host-pkgconf libnss @@ -23,12 +28,6 @@ else CHRONY_CONF_OPTS += --disable-readline endif -# Ditch the doc build, needs makeinfo and we don't need them -define CHRONY_DISABLE_DOCS - $(SED) 's/chronyc chrony.txt/chronyc/' $(@D)/Makefile.in -endef -CHRONY_POST_PATCH_HOOKS += CHRONY_DISABLE_DOCS - define CHRONY_CONFIGURE_CMDS cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(CHRONY_CONF_OPTS) endef From 4a9d98073ef5a67c938882262d4be745cfce3b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 18 Nov 2015 10:03:25 +0100 Subject: [PATCH 060/132] pkg-download: support 'file://' in BR2_PRIMARY_SITE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This feature was already discuted here: http://lists.busybox.net/pipermail/buildroot/2015-April/125419.html Personally, I have a big central directory with all tarballs I have ever downloaded. I use this feature to isolate tarballs necessary to build a configuration: make project_defconfig make BR2_DL_DIR=/tmp/mirror-project BR2_PRIMARY_SITE=file:///home/user/dl source tar -C /tmp -czvf mirror-project.tgz mirror-project Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- Config.in | 6 ++++-- package/pkg-download.mk | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Config.in b/Config.in index d795361148..1809eebd3e 100644 --- a/Config.in +++ b/Config.in @@ -165,8 +165,10 @@ config BR2_PRIMARY_SITE Primary site to download from. If this option is set then buildroot will try to download package source first from this site and try the default if the file is not found. - Valid URIs are URIs recognized by $(WGET) and scp URIs of the form - scp://[user@]host:path. + Valid URIs are: + - URIs recognized by $(WGET) + - local URIs of the form file://absolutepath + - scp URIs of the form scp://[user@]host:path. config BR2_PRIMARY_SITE_ONLY bool "Only allow downloads from primary download site" diff --git a/package/pkg-download.mk b/package/pkg-download.mk index c86b9abcff..f08f616099 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -214,6 +214,7 @@ endef define DOWNLOAD_INNER $(Q)if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \ case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \ + file) $(call $(3)_LOCALFILES,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \ scp) $(call $(3)_SCP,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \ *) $(call $(3)_WGET,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \ esac ; \ From 64f36309605445dfe01ed644897223d78f470380 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 20 Nov 2015 15:45:48 -0300 Subject: [PATCH 061/132] glibmm: bump to version 2.46.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/glibmm/glibmm.hash | 4 ++-- package/glibmm/glibmm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/glibmm/glibmm.hash b/package/glibmm/glibmm.hash index 9a7a6c889a..aeb26bf348 100644 --- a/package/glibmm/glibmm.hash +++ b/package/glibmm/glibmm.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.46/glibmm-2.46.1.sha256sum -sha256 9647e596c1081d2ea202bd3da2824ec2ea359498fa86eb59a55b1b307dd8c4aa glibmm-2.46.1.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.46/glibmm-2.46.2.sha256sum +sha256 7221a01a768c1cce2bb994cb6ebfe634246dba4788f910484d04e3b0d903a3c8 glibmm-2.46.2.tar.xz diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk index 66b357d400..7f8ee9fc44 100644 --- a/package/glibmm/glibmm.mk +++ b/package/glibmm/glibmm.mk @@ -5,7 +5,7 @@ ################################################################################ GLIBMM_VERSION_MAJOR = 2.46 -GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).1 +GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).2 GLIBMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools) GLIBMM_LICENSE_FILES = COPYING COPYING.tools GLIBMM_SOURCE = glibmm-$(GLIBMM_VERSION).tar.xz From 93239dfdab13a303b9695360605cdb87eb932d09 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 20 Nov 2015 15:47:19 -0300 Subject: [PATCH 062/132] libnspr: bump to version 4.11 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libnspr/libnspr.hash | 4 ++-- package/libnspr/libnspr.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnspr/libnspr.hash b/package/libnspr/libnspr.hash index 0a5ee879a3..87f6d4fafa 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.10.10/src/SHA256SUMS -sha256 343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107 nspr-4.10.10.tar.gz +# From https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.11/src/SHA256SUMS +sha256 cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2 nspr-4.11.tar.gz diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index 9124ce02d5..207da4ee67 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.10.10 +LIBNSPR_VERSION = 4.11 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 c0e48bb721363a78a12ace3785ffb4dc3c9e6f93 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 20 Nov 2015 15:47:20 -0300 Subject: [PATCH 063/132] libnss: bump to version 3.21 Disable gtests since they require C++ support. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 9e2478672b..4fa5897b57 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_20_RTM/src/SHA256SUMS -sha256 5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c nss-3.20.tar.gz +# From https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/SHA256SUMS +sha256 3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239 nss-3.21.tar.gz diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index f283bb3d34..10879e219d 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.20 +LIBNSS_VERSION = 3.21 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 @@ -19,6 +19,7 @@ LIBNSS_BUILD_VARS = \ NSPR_LIB_DIR=$(STAGING_DIR)/usr/lib \ BUILD_OPT=1 \ NS_USE_GCC=1 \ + NSS_DISABLE_GTESTS=1 \ NSS_USE_SYSTEM_SQLITE=1 \ NSS_ENABLE_ECC=1 \ NATIVE_CC="$(HOSTCC)" \ From f47f14f8386e9cf0914fcd701cb96f7890d3f6bb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 22 Nov 2015 11:00:56 +0100 Subject: [PATCH 064/132] package/eudev: bump version to 3.1.5 Remove two patches applied upstream: https://github.com/gentoo/eudev/commit/0e2be0c217028e73073e7f9ccb010cc8b4d756db https://github.com/gentoo/eudev/commit/24ccb6ebc5e13a128aaedd3a2eb52eef3adf6dcd Due to the removed patches autoreconf is not necessary anymore. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0002-build-sys-check-for-mallinfo.patch | 93 ------------------- .../0003-build-sys-check-for-strndupa.patch | 69 -------------- package/eudev/eudev.hash | 4 +- package/eudev/eudev.mk | 7 +- 4 files changed, 3 insertions(+), 170 deletions(-) delete mode 100644 package/eudev/0002-build-sys-check-for-mallinfo.patch delete mode 100644 package/eudev/0003-build-sys-check-for-strndupa.patch diff --git a/package/eudev/0002-build-sys-check-for-mallinfo.patch b/package/eudev/0002-build-sys-check-for-mallinfo.patch deleted file mode 100644 index c2fa2daf20..0000000000 --- a/package/eudev/0002-build-sys-check-for-mallinfo.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 1205e0b50067c5ebfa082f149f0996304aa04335 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Thu, 30 Jul 2015 16:55:45 +0200 -Subject: [PATCH] build-sys: check for mallinfo -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -mallinfo is not specified by POSIX or the C standards, therefore -it's not available for all libc libraries (musl). - -Add the ability to disable mallinfo statistics. - -Fixes: -selinux-util.c: In function ‘mac_selinux_init’: -selinux-util.c:70:25: error: storage size of ‘before_mallinfo’ isn’t known - struct mallinfo before_mallinfo, after_mallinfo; - -Signed-off-by: Romain Naour ---- - configure.ac | 3 +++ - src/shared/selinux-util.c | 15 +++++++++++++++ - 2 files changed, 18 insertions(+) - -diff --git a/configure.ac b/configure.ac -index ec23ab5..4a293b2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -226,6 +226,9 @@ else - fi - AC_SUBST(sushell) - -+# selinux-util.c uses struct mallinfo which is not available for all C libraries (musl). -+AC_CHECK_FUNCS([mallinfo]) -+ - # ------------------------------------------------------------------------------ - - AC_CHECK_DECL([unshare], -diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c -index 756215e..4e0866b 100644 ---- a/src/shared/selinux-util.c -+++ b/src/shared/selinux-util.c -@@ -67,7 +67,10 @@ int mac_selinux_init(const char *prefix) { - - #ifdef HAVE_SELINUX - usec_t before_timestamp, after_timestamp; -+ -+#ifdef HAVE_MALLINFO - struct mallinfo before_mallinfo, after_mallinfo; -+#endif - - if (!mac_selinux_use()) - return 0; -@@ -75,7 +78,10 @@ int mac_selinux_init(const char *prefix) { - if (label_hnd) - return 0; - -+#ifdef HAVE_MALLINFO - before_mallinfo = mallinfo(); -+#endif -+ - before_timestamp = now(CLOCK_MONOTONIC); - - if (prefix) { -@@ -92,9 +98,14 @@ int mac_selinux_init(const char *prefix) { - r = security_getenforce() == 1 ? -errno : 0; - } else { - char timespan[FORMAT_TIMESPAN_MAX]; -+ -+#ifdef HAVE_MALLINFO - int l; -+#endif - - after_timestamp = now(CLOCK_MONOTONIC); -+ -+#ifdef HAVE_MALLINFO - after_mallinfo = mallinfo(); - - l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0; -@@ -102,6 +113,10 @@ int mac_selinux_init(const char *prefix) { - log_debug("Successfully loaded SELinux database in %s, size on heap is %iK.", - format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0), - (l+1023)/1024); -+#else -+ log_debug("Successfully loaded SELinux database in %s", -+ format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0)); -+#endif - } - #endif - --- -2.4.3 - diff --git a/package/eudev/0003-build-sys-check-for-strndupa.patch b/package/eudev/0003-build-sys-check-for-strndupa.patch deleted file mode 100644 index 9cbd5850ae..0000000000 --- a/package/eudev/0003-build-sys-check-for-strndupa.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 0b04a8347981ceb1030768c3002ac3c2bc0a0bf1 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Thu, 30 Jul 2015 17:31:31 +0200 -Subject: [PATCH] build-sys: check for strndupa - -strndupa is a GNU extension, therefore it's not available -for all libc libraries (musl). - -This patch is based on the one proposed by Emil Renner Berthing for -systemd [1]. - -[1] http://lists.freedesktop.org/archives/systemd-devel/2014-September/023190.html - -Signed-off-by: Romain Naour ---- - configure.ac | 3 ++- - src/shared/missing.h | 11 +++++++++++ - src/shared/selinux-util.c | 1 + - 3 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 4a293b2..9c383c2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -66,8 +66,9 @@ AC_C_INLINE - AC_TYPE_MODE_T - AC_TYPE_PID_T - AC_CHECK_MEMBERS([struct stat.st_rdev]) --AC_CHECK_DECLS([getrandom, gettid, name_to_handle_at, accept4, mkostemp], [], [], [[#include -+AC_CHECK_DECLS([getrandom, gettid, name_to_handle_at, accept4, mkostemp, strndupa], [], [], [[#include - #include -+#include - #include - #include - #include -diff --git a/src/shared/missing.h b/src/shared/missing.h -index 2dc9d84..9031119 100644 ---- a/src/shared/missing.h -+++ b/src/shared/missing.h -@@ -158,3 +158,14 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle - #ifndef AT_EMPTY_PATH - #define AT_EMPTY_PATH 0x1000 - #endif -+ -+#if !HAVE_DECL_STRNDUPA -+#define strndupa(s, n) \ -+ ({ \ -+ const char *__old = (s); \ -+ size_t __len = strnlen(__old, (n)); \ -+ char *__new = (char *)alloca(__len + 1); \ -+ __new[__len] = '\0'; \ -+ (char *)memcpy(__new, __old, __len); \ -+ }) -+#endif -diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c -index 4e0866b..a18a5a7 100644 ---- a/src/shared/selinux-util.c -+++ b/src/shared/selinux-util.c -@@ -31,6 +31,7 @@ - #include "strv.h" - #include "path-util.h" - #include "selinux-util.h" -+#include "missing.h" - - #ifdef HAVE_SELINUX - DEFINE_TRIVIAL_CLEANUP_FUNC(security_context_t, freecon); --- -2.4.3 - diff --git a/package/eudev/eudev.hash b/package/eudev/eudev.hash index d54c8cf0ce..e7c331ca9b 100644 --- a/package/eudev/eudev.hash +++ b/package/eudev/eudev.hash @@ -1,4 +1,4 @@ # From http://dev.gentoo.org/~blueness/eudev/ -md5 07ab33fe310d250f06fc28f010e3fde2 eudev-3.1.2.tar.gz +md5 c4dace42deecede102b6c01904042acc eudev-3.1.5.tar.gz # Locally calculated -sha256 4393b69e93dd8117defde6519b199d479f9d051f52061157a1a7a41b8fe10273 eudev-3.1.2.tar.gz +sha256 f75885a430cd50fe4b31732f808ba7f9b2adf0f26b53b8ba2957b0c1d84b6f2a eudev-3.1.5.tar.gz diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index a005f45de5..fecd37ce56 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -4,18 +4,13 @@ # ################################################################################ -EUDEV_VERSION = 3.1.2 +EUDEV_VERSION = 3.1.5 EUDEV_SOURCE = eudev-$(EUDEV_VERSION).tar.gz EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev EUDEV_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries) EUDEV_LICENSE_FILES = COPYING EUDEV_INSTALL_STAGING = YES -# configure.ac is patched by: -# 0002-build-sys-check-for-mallinfo.patch -# 0003-build-sys-check-for-strndupa.patch -EUDEV_AUTORECONF = YES - # mq_getattr is in librt EUDEV_CONF_ENV += LIBS=-lrt From d13d02556595fb0c63d4a269e51a80abe0dc555e Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sat, 21 Nov 2015 16:41:19 +0100 Subject: [PATCH 065/132] python-web2py: bump to version 2.11.3 This patch bumps web2py version to 2.11.3 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/python-web2py/python-web2py.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index db9ed8dfd8..f5f572c860 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = R-2.11.2 +PYTHON_WEB2PY_VERSION = R-2.11.3 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPLv3 PYTHON_WEB2PY_LICENSE_FILES = LICENSE From ba8ad1383365e0e4c7e6d2570c2a142c0434a41b Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 22 Nov 2015 00:18:37 +0100 Subject: [PATCH 066/132] package/Makefile.in: remove HOSTCC_VERSION HOSTCC_VERSION is no longer used since gcc switched to the package infrastructure in e236fe481. It was in fact no longer needed since we dropped support for gcc 4.3. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/Makefile.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index ca34660a6f..bb2a0f96df 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -219,10 +219,6 @@ HOST_CFLAGS += $(HOST_CPPFLAGS) HOST_CXXFLAGS += $(HOST_CFLAGS) HOST_LDFLAGS += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib -# hostcc version as an integer - E.G. 4.3.2 => 432 -HOSTCC_VERSION := $(shell $(HOSTCC_NOCCACHE) --version | \ - sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p') - # host-intltool should be executed with the system perl, so we save # the path to the system perl, before a host-perl built by Buildroot # might get installed into $(HOST_DIR)/usr/bin and therefore appears From 590683b1f0677b3c3675647abd222076c3e79c14 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 21 Nov 2015 20:40:29 +0100 Subject: [PATCH 067/132] package/yasm: bump version to 1.3.0 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/yasm/yasm.hash | 2 +- package/yasm/yasm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/yasm/yasm.hash b/package/yasm/yasm.hash index d5cf267d44..016c15b90a 100644 --- a/package/yasm/yasm.hash +++ b/package/yasm/yasm.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31 yasm-1.2.0.tar.gz +sha256 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f yasm-1.3.0.tar.gz diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk index 0bbd22d06b..bf8a481561 100644 --- a/package/yasm/yasm.mk +++ b/package/yasm/yasm.mk @@ -4,7 +4,7 @@ # ################################################################################ -YASM_VERSION = 1.2.0 +YASM_VERSION = 1.3.0 YASM_SITE = http://www.tortall.net/projects/yasm/releases define YASM_PRE_CONFIGURE_FIXUP From 9e8413a86e9822c6685cc686bbf2b8024c842947 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 21 Nov 2015 20:40:31 +0100 Subject: [PATCH 068/132] package/libass: bump version to 0.13.0 Quote from https://github.com/libass/libass/blob/master/Changelog "* Drop ENCA support" Therefore we remove the dependency to libenca. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libass/libass.hash | 2 +- package/libass/libass.mk | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/package/libass/libass.hash b/package/libass/libass.hash index f30016657e..87d3f269e4 100644 --- a/package/libass/libass.hash +++ b/package/libass/libass.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 a67c54ebaf5ec19ae72e86259ee6ab6adfe2e64ed9f9149db03dc863360ea38c libass-0.12.3.tar.xz +sha256 e0071a3b2e95411c8d474014678368e3f0b852f7d663e0564b344e7335eb0671 libass-0.13.0.tar.xz diff --git a/package/libass/libass.mk b/package/libass/libass.mk index f1f00f356c..83939e2493 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.12.3 +LIBASS_VERSION = 0.13.0 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. @@ -38,11 +38,4 @@ else LIBASS_CONF_OPTS += --disable-harfbuzz endif -ifeq ($(BR2_PACKAGE_LIBENCA),y) -LIBASS_DEPENDENCIES += libenca -LIBASS_CONF_OPTS += --enable-enca -else -LIBASS_CONF_OPTS += --disable-enca -endif - $(eval $(autotools-package)) From 9334e73358bc2e991b37a8c533095ed127ec5065 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 21 Nov 2015 20:40:32 +0100 Subject: [PATCH 069/132] package/libfribidi: bump version to 0.19.7 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libfribidi/libfribidi.hash | 4 ++-- package/libfribidi/libfribidi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash index 003944a98a..79b5dd3185 100644 --- a/package/libfribidi/libfribidi.hash +++ b/package/libfribidi/libfribidi.hash @@ -1,2 +1,2 @@ -# From http://www.fribidi.org/download/fribidi-0.19.6.tar.bz2.sha256 -sha256 cba8b7423c817e5adf50d28ec9079d14eafcec9127b9e8c8f1960c5ad585e17d fribidi-0.19.6.tar.bz2 +# From http://www.fribidi.org/download/fribidi-0.19.7.tar.bz2.sha256 +sha256 08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e fribidi-0.19.7.tar.bz2 diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index 1cf3b7ce30..4e82a5e4df 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 0.19.6 +LIBFRIBIDI_VERSION = 0.19.7 LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.bz2 LIBFRIBIDI_SITE = http://www.fribidi.org/download LIBFRIBIDI_LICENSE = LGPLv2.1+ From b49bd873e8cf27e3e4159d3851fac0c04b5fe150 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 21 Nov 2015 20:40:33 +0100 Subject: [PATCH 070/132] package/libglew: bump version to 1.13.0 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libglew/libglew.hash | 2 +- package/libglew/libglew.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libglew/libglew.hash b/package/libglew/libglew.hash index 68c3e7a227..5e12785cb1 100644 --- a/package/libglew/libglew.hash +++ b/package/libglew/libglew.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 af58103f4824b443e7fa4ed3af593b8edac6f3a7be3b30911edbc7344f48e4bf glew-1.12.0.tgz +sha256 aa25dc48ed84b0b64b8d41cdd42c8f40f149c37fa2ffa39cd97f42c78d128bc7 glew-1.13.0.tgz diff --git a/package/libglew/libglew.mk b/package/libglew/libglew.mk index 4d26ed855c..dc73f39621 100644 --- a/package/libglew/libglew.mk +++ b/package/libglew/libglew.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGLEW_VERSION = 1.12.0 +LIBGLEW_VERSION = 1.13.0 LIBGLEW_SOURCE = glew-$(LIBGLEW_VERSION).tgz LIBGLEW_SITE = http://sourceforge.net/projects/glew/files/glew/$(LIBGLEW_VERSION) LIBGLEW_LICENSE = BSD-3c, MIT From e9c6f73d4bf35981fee8eb7eb4e905b39390ffb3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 21 Nov 2015 20:40:34 +0100 Subject: [PATCH 071/132] package/tvheadend: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tvheadend/0001-no-check_config.patch | 2 +- package/tvheadend/tvheadend.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tvheadend/0001-no-check_config.patch b/package/tvheadend/0001-no-check_config.patch index c77ca76bf0..6a0cdddd73 100644 --- a/package/tvheadend/0001-no-check_config.patch +++ b/package/tvheadend/0001-no-check_config.patch @@ -16,7 +16,7 @@ diff -durN tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile tvhe $(ROOTDIR)/configure $(CONFIGURE_ARGS) # Binary --${PROG}: check_config make_webui $(OBJS) +-${PROG}: .config.mk make_webui $(OBJS) +${PROG}: make_webui $(OBJS) $(CC) -o $@ $(OBJS) $(CFLAGS) $(LDFLAGS) diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 6b8fdea126..60ca52445a 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = a27b0af2b82dae83cf8a41e01ee1174b911f3aa3 +TVHEADEND_VERSION = 8902dcbcc48b6a76168882a856111237f13e60ea TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPLv3+ TVHEADEND_LICENSE_FILES = LICENSE.md From 24340a5acc78d6b5cec9c90908b24dabc1f27c05 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 21 Nov 2015 20:40:35 +0100 Subject: [PATCH 072/132] package/{mesa3d, mesa3d-headers}: bump version to 11.0.6 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 e65f01dbd1..6db845d296 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.0.5 +MESA3D_HEADERS_VERSION = 11.0.6 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 8b9c8c642e..6eaa5d6dcd 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,2 +1,2 @@ -# From http://lists.freedesktop.org/archives/mesa-announce/2015-November/000181.html -sha256 9c255a2a6695fcc6ef4a279e1df0aeaf417dc142f39ee59dfb533d80494bb67a mesa-11.0.5.tar.xz +# From http://lists.freedesktop.org/archives/mesa-announce/2015-November/000184.html +sha256 8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760 mesa-11.0.6.tar.xz diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 4f484f78f2..457babc0de 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.0.5 +MESA3D_VERSION = 11.0.6 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos From 764739042d5d7395a61517662271c0c64c909de8 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 23 Nov 2015 15:35:06 +0000 Subject: [PATCH 073/132] nmap: bump version to 7.00 Signed-off-by: Vicente Olivert Riera Tested-by: "Yann E. MORIN" Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/nmap/nmap.hash | 2 +- package/nmap/nmap.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nmap/nmap.hash b/package/nmap/nmap.hash index 8c8da00758..c7b3cf58dc 100644 --- a/package/nmap/nmap.hash +++ b/package/nmap/nmap.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 nmap-6.47.tar.bz2 +sha256 9f442301c615c608a385831c3505cdfed9b0795cd100f1a258b04509802802ae nmap-7.00.tar.bz2 diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 1a0e977d39..c4fbe72f5e 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMAP_VERSION = 6.47 +NMAP_VERSION = 7.00 NMAP_SITE = http://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 NMAP_DEPENDENCIES = libpcap pcre From bbe6d2d554bfe5e7f062e957511d506664ce6913 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 23 Nov 2015 15:57:24 +0000 Subject: [PATCH 074/132] wireshark: bump version to 2.0.0 Signed-off-by: Vicente Olivert Riera Tested-by: "Yann E. MORIN" Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/wireshark/wireshark.hash | 6 ++---- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index ee50e3fb32..c1e1d5834d 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,4 +1,2 @@ -# From https://www.wireshark.org/download/SIGNATURES-1.12.8.txt -sha1 d8c23120525a2f3505e822b7684e7367bcd0ba70 wireshark-1.12.8.tar.bz2 -# Calculated based on the hash above -sha256 357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7 wireshark-1.12.8.tar.bz2 +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.0.0.txt +sha256 90026c761a85701d7783c7e2eaa4c1de247dfbadbd53221df355f121e42691dd wireshark-2.0.0.tar.bz2 diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index ffadf80e32..366134d563 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 1.12.8 +WIRESHARK_VERSION = 2.0.0 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From aa7a32b24da084ef583a5a042d65b41640b23a8d Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 23 Nov 2015 16:17:35 +0000 Subject: [PATCH 075/132] lvm2: bump version to 2.02.135 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/lvm2/lvm2.hash | 2 +- package/lvm2/lvm2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index c6a9ea1afd..a51b9a49e6 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 d5c695c9f3120d8e20845510f11204e6f8d13b6656a05c78f1b71482e97f63fd93ede54ec99cab14074421d3ecf6e501ec9e6581976ff266158f2910d25bbcf3 LVM2.2.02.132.tgz +sha512 698fadf1a12f6bfc6f8bd9d6499d2cf181e2cf7b9a5105b58cb55168f6104c949aa5d5da0585194d54614128a14abc7b939d43b32f7175057ad14cb1c62796a0 LVM2.2.02.135.tgz diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 6df9b35ea3..9caa0517b9 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.02.132 +LVM2_VERSION = 2.02.135 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_INSTALL_STAGING = YES From 5517c1b27f41a47007d33e6b0c95f7b864b86bf5 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 23 Nov 2015 11:03:51 -0300 Subject: [PATCH 076/132] gnutls: bump to version 3.3.19 Signed-off-by: Gustavo Zacarias Reviewed-by: Vicente Olivert Riera Tested-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/gnutls/gnutls.hash | 2 +- package/gnutls/gnutls.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 088059b383..b33c8385cb 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 7a87e7f486d1ada10007356917a412cde6c6114dac018e3569e3aa09e9f29395 gnutls-3.3.18.tar.xz +sha256 888d8779b48f21959b33d4d9ad0b546e5ec3dea20abf0d9bb03869d56b1f44cf gnutls-3.3.19.tar.xz diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 9fbdb4906d..1ac3e4e6a4 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.3 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).18 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).19 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = GPLv3+ LGPLv2.1+ From 7d6858dd7410ee97546fc09d55a46e39289c456f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 22 Nov 2015 15:39:41 +0100 Subject: [PATCH 077/132] core/pkg-autotools: align host configure commands to target one The host configure commands are not indented the same way as the target ones. Besides, there are leading spaces (instead of TABs) on one line. Replicate the same indentation as used for the target commands. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/pkg-autotools.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 478791475c..502eeea6aa 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -214,12 +214,12 @@ else # installed. define $(2)_CONFIGURE_CMDS (cd $$($$(PKG)_SRCDIR) && rm -rf config.cache; \ - $$(HOST_CONFIGURE_OPTS) \ - CFLAGS="$$(HOST_CFLAGS)" \ - LDFLAGS="$$(HOST_LDFLAGS)" \ - $$($$(PKG)_CONF_ENV) \ - CONFIG_SITE=/dev/null \ - ./configure \ + $$(HOST_CONFIGURE_OPTS) \ + CFLAGS="$$(HOST_CFLAGS)" \ + LDFLAGS="$$(HOST_LDFLAGS)" \ + $$($$(PKG)_CONF_ENV) \ + CONFIG_SITE=/dev/null \ + ./configure \ --prefix="$$(HOST_DIR)/usr" \ --sysconfdir="$$(HOST_DIR)/etc" \ --localstatedir="$$(HOST_DIR)/var" \ From bf23db235ca0f823b89aaf15835011ad0a52732a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 22 Nov 2015 15:39:42 +0100 Subject: [PATCH 078/132] package/gcc: comment on why we override the generic configure commands MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The explanations given in the commit log of 7d6c79 (Compile static versions of gcc libraries) do not explain why we have to provide custom configure commands, instead of just adding --enable-static to the configure options. Add a comment in the code that explains why that is so. Add a pointer to the ML archives with the explanations, too. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Jérôme Pouiller Acked-by: Jérôme Pouiller Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/gcc/gcc-final/gcc-final.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 0467ac2934..c416b44e6d 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -27,6 +27,15 @@ HOST_GCC_FINAL_SUBDIR = build HOST_GCC_FINAL_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK +# We want to always build the static variants of all the gcc libraries, +# of which libstdc++, libgomp, libmudflap... +# To do so, we can not just pass --enable-static to override the generic +# --disable-static flag, otherwise gcc fails to build some of those +# libraries, see; +# http://lists.busybox.net/pipermail/buildroot/2013-October/080412.html +# +# So we must completely override the generic commands and provide our own. +# define HOST_GCC_FINAL_CONFIGURE_CMDS (cd $(HOST_GCC_FINAL_SRCDIR) && rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ From d3d550ddd65682edc45ce388e694951d44fd2db3 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Mon, 23 Nov 2015 12:25:06 +1300 Subject: [PATCH 079/132] micropython: Bump version to v1.5 Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- package/micropython/micropython.hash | 2 ++ package/micropython/micropython.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 package/micropython/micropython.hash diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash new file mode 100644 index 0000000000..24b878e484 --- /dev/null +++ b/package/micropython/micropython.hash @@ -0,0 +1,2 @@ +#locally computed +sha256 4ba128def442275ef528c210d8d3dc6d6e12460069a570706b5fbdb6b4a6a25f micropython-v1.5.tar.gz diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index f5e0ce7ebc..2126f15721 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -4,7 +4,7 @@ # ################################################################################ -MICROPYTHON_VERSION = v1.4.6 +MICROPYTHON_VERSION = v1.5 MICROPYTHON_SITE = $(call github,micropython,micropython,$(MICROPYTHON_VERSION)) MICROPYTHON_LICENSE = MIT MICROPYTHON_LICENSE_FILES = LICENSE From ba47817d52fb304b0227c318e3a8d9a8e5494ea9 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Mon, 23 Nov 2015 12:25:07 +1300 Subject: [PATCH 080/132] micropython-lib: Add hash file Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- package/micropython-lib/micropython-lib.hash | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package/micropython-lib/micropython-lib.hash diff --git a/package/micropython-lib/micropython-lib.hash b/package/micropython-lib/micropython-lib.hash new file mode 100644 index 0000000000..7ab22d534b --- /dev/null +++ b/package/micropython-lib/micropython-lib.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 f66bfe0e7d2d61119a5def989f74278f42bee7d04162913ea60d3f2955d65909 micropython-lib-v0.5.tar.gz From 4c849ebe70dc5ba8aa949d066d0fd52cf8574b72 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 24 Nov 2015 13:15:37 -0300 Subject: [PATCH 081/132] xtables-addons: bump to version 2.10 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/xtables-addons/xtables-addons.hash | 7 ++++--- package/xtables-addons/xtables-addons.mk | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/xtables-addons/xtables-addons.hash b/package/xtables-addons/xtables-addons.hash index c82f0165e2..be8cb6e4cf 100644 --- a/package/xtables-addons/xtables-addons.hash +++ b/package/xtables-addons/xtables-addons.hash @@ -1,3 +1,4 @@ -# Locally calculated after checking signature file from: -# http://sourceforge.net/projects/xtables-addons/files/Xtables-addons/2.9/ -sha256 648f6cd17ba41916df5bb605e617b2f18461090139e67d7cf5c5bd8a04c701b0 xtables-addons-2.9.tar.xz +# From http://sourceforge.net/projects/xtables-addons/files/Xtables-addons/2.10/ +sha1 bc6dcb1eb1328931189f6e73a1a02ef4cc51bc44 xtables-addons-2.10.tar.xz +# Calculated based on the hash above +sha256 2a2d92ae924437d757f55514502c6ef3aeccc6106f729c702efe703ad30f4007 xtables-addons-2.10.tar.xz diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index 30353a070f..66e7386271 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTABLES_ADDONS_VERSION = 2.9 +XTABLES_ADDONS_VERSION = 2.10 XTABLES_ADDONS_SOURCE = xtables-addons-$(XTABLES_ADDONS_VERSION).tar.xz XTABLES_ADDONS_SITE = http://downloads.sourceforge.net/project/xtables-addons/Xtables-addons XTABLES_ADDONS_DEPENDENCIES = iptables linux host-pkgconf From 3b5d3291e544653efeaeb78984d757dc2ab1757e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 24 Nov 2015 13:24:12 -0300 Subject: [PATCH 082/132] gmp: bump to version 6.1.0 Patches are upstream so drop them. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- ...01-arm-asm-conditional-on-no-thumb-1.patch | 21 ------------------ ...02-arm-asm-conditional-on-no-thumb-2.patch | 21 ------------------ ...vide-default-bmod-to-mod-threshold-1.patch | 22 ------------------- package/gmp/gmp.hash | 2 +- package/gmp/gmp.mk | 2 +- 5 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 package/gmp/0001-arm-asm-conditional-on-no-thumb-1.patch delete mode 100644 package/gmp/0002-arm-asm-conditional-on-no-thumb-2.patch delete mode 100644 package/gmp/0003-powerpc-provide-default-bmod-to-mod-threshold-1.patch diff --git a/package/gmp/0001-arm-asm-conditional-on-no-thumb-1.patch b/package/gmp/0001-arm-asm-conditional-on-no-thumb-1.patch deleted file mode 100644 index eb678b01b0..0000000000 --- a/package/gmp/0001-arm-asm-conditional-on-no-thumb-1.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# HG changeset patch -# User Torbjorn Granlund -# Date 1396035313 -3600 -# Node ID c56ea318eb6435bdd28dbfef657b2fe372134f1f -# Parent c6fe20ab62acc266ff5ad3629bef447bc43dcd1b -Conditionalise ARM asm on !__thumb__. - -diff -r c6fe20ab62ac -r c56ea318eb64 mpn/generic/mod_1_1.c ---- a/mpn/generic/mod_1_1.c Wed Mar 26 12:58:33 2014 +0100 -+++ b/mpn/generic/mod_1_1.c Fri Mar 28 20:35:13 2014 +0100 -@@ -129,7 +129,7 @@ - "%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC) - #endif - --#if defined (__arm__) && W_TYPE_SIZE == 32 -+#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32 - #define add_mssaaaa(m, sh, sl, ah, al, bh, bl) \ - __asm__ ( "adds %2, %5, %6\n\t" \ - "adcs %1, %3, %4\n\t" \ - diff --git a/package/gmp/0002-arm-asm-conditional-on-no-thumb-2.patch b/package/gmp/0002-arm-asm-conditional-on-no-thumb-2.patch deleted file mode 100644 index 666cf58cf6..0000000000 --- a/package/gmp/0002-arm-asm-conditional-on-no-thumb-2.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# HG changeset patch -# User Torbjorn Granlund -# Date 1396602422 -7200 -# Node ID 676e2d0f0e4dd301a7066079d2c9326c25c34a40 -# Parent 0194a75b56b21a9196626430af86c5bd9110c42d -Conditionalise ARM asm on !__thumb__. - -diff -r 0194a75b56b2 -r 676e2d0f0e4d mpn/generic/div_qr_1n_pi1.c ---- a/mpn/generic/div_qr_1n_pi1.c Thu Apr 03 23:58:51 2014 +0200 -+++ b/mpn/generic/div_qr_1n_pi1.c Fri Apr 04 11:07:02 2014 +0200 -@@ -130,7 +130,7 @@ - "%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC) - #endif - --#if defined (__arm__) && W_TYPE_SIZE == 32 -+#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32 - #define add_mssaaaa(m, sh, sl, ah, al, bh, bl) \ - __asm__ ( "adds %2, %5, %6\n\t" \ - "adcs %1, %3, %4\n\t" \ - diff --git a/package/gmp/0003-powerpc-provide-default-bmod-to-mod-threshold-1.patch b/package/gmp/0003-powerpc-provide-default-bmod-to-mod-threshold-1.patch deleted file mode 100644 index 76aa72f086..0000000000 --- a/package/gmp/0003-powerpc-provide-default-bmod-to-mod-threshold-1.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# HG changeset patch -# User Torbjorn Granlund -# Date 1395835068 -3600 -# Node ID 4a6d258b467f661da0894cc60ecd060f2e3c67c7 -# Parent 301ce2788826a2d4d2725bd5cf01e998638db37a -Provide default for BMOD_1_TO_MOD_1_THRESHOLD. - -diff -r 301ce2788826 -r 4a6d258b467f mpn/powerpc64/mode64/gcd_1.asm ---- a/mpn/powerpc64/mode64/gcd_1.asm Tue Mar 25 15:34:52 2014 +0100 -+++ b/mpn/powerpc64/mode64/gcd_1.asm Wed Mar 26 12:57:48 2014 +0100 -@@ -43,6 +43,9 @@ - define(`n', `r4') - define(`v0', `r5') - -+ifdef(`BMOD_1_TO_MOD_1_THRESHOLD',, -+ `define(`BMOD_1_TO_MOD_1_THRESHOLD',30)') -+ - EXTERN_FUNC(mpn_mod_1) - EXTERN_FUNC(mpn_modexact_1c_odd) - - diff --git a/package/gmp/gmp.hash b/package/gmp/gmp.hash index 9fe634406b..e803623c00 100644 --- a/package/gmp/gmp.hash +++ b/package/gmp/gmp.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764 gmp-6.0.0a.tar.xz +sha256 68dadacce515b0f8a54f510edf07c1b636492bcdb8e8d54c56eb216225d16989 gmp-6.1.0.tar.xz diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index f71a2109ab..c143794b45 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -4,7 +4,7 @@ # ################################################################################ -GMP_VERSION = 6.0.0a +GMP_VERSION = 6.1.0 GMP_SITE = $(BR2_GNU_MIRROR)/gmp GMP_SOURCE = gmp-$(GMP_VERSION).tar.xz GMP_INSTALL_STAGING = YES From 2d5158fd62ae9ea2e608f43f2db445aed4613e67 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sun, 22 Nov 2015 22:21:14 +0100 Subject: [PATCH 083/132] python/web2py: bump to version 2.12.3 - hash file This patch bumps web2py to the latest released version (2.12.3) and adds hash file. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/python-web2py/python-web2py.hash | 2 ++ package/python-web2py/python-web2py.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 package/python-web2py/python-web2py.hash diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash new file mode 100644 index 0000000000..3de8dbf4de --- /dev/null +++ b/package/python-web2py/python-web2py.hash @@ -0,0 +1,2 @@ +# sha256 locally computed +sha256 7e22a5624d8d2909e165110f0bec6b43ee36ff6834d689f4027e06dece662031 python-web2py-R-2.12.3.tar.gz diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index f5f572c860..38faabc55d 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = R-2.11.3 +PYTHON_WEB2PY_VERSION = R-2.12.3 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPLv3 PYTHON_WEB2PY_LICENSE_FILES = LICENSE From 2fa01e87f2254dfbea4b153d753d973e0c710c9a Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Fri, 20 Nov 2015 14:17:53 +0100 Subject: [PATCH 084/132] systemd: Bump version Signed-off-by: Maxime Hadjinlian Reviewed-by: Vicente Olivert Riera Tested-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- 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 60aebcf6e9..8090200043 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 6766e8489e359f3d608a9f032eb1f52d7c55d76d0f9171837cf2b3284b2b904b systemd-227.tar.gz +sha256 dd124ff561a07e6439ed2b3713f38ca914df7747f110ce86deea17b56d245ae6 systemd-228.tar.gz diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 35dac832a5..e4320697f6 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 227 +SYSTEMD_VERSION = 228 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 7978db9b86183f2dd2b62c222d390d7ad330be49 Mon Sep 17 00:00:00 2001 From: Nikolay Dimitrov Date: Tue, 24 Nov 2015 22:08:43 +0200 Subject: [PATCH 085/132] configs/riotboard: bump kernel to version 4.2.6 Signed-off-by: Nikolay Dimitrov Signed-off-by: Peter Korsgaard --- configs/riotboard_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig index 7795787298..8a3f6b7c4d 100644 --- a/configs/riotboard_defconfig +++ b/configs/riotboard_defconfig @@ -21,13 +21,13 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y # kernel headers BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="4.2.3" +BR2_DEFAULT_KERNEL_VERSION="4.2.6" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_2=y # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.2.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.2.6" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y From 23e48191071d0b187073dee807ba25b7d4a9255c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 24 Nov 2015 14:11:06 -0300 Subject: [PATCH 086/132] minizip: new package Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/minizip/Config.in | 15 +++++++++++++++ package/minizip/minizip.hash | 2 ++ package/minizip/minizip.mk | 16 ++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 package/minizip/Config.in create mode 100644 package/minizip/minizip.hash create mode 100644 package/minizip/minizip.mk diff --git a/package/Config.in b/package/Config.in index 3656c54c3d..988fe844b8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -741,6 +741,7 @@ menu "Compression and decompression" source "package/libsquish/Config.in" source "package/libzip/Config.in" source "package/lzo/Config.in" + source "package/minizip/Config.in" source "package/snappy/Config.in" source "package/szip/Config.in" source "package/zlib/Config.in" diff --git a/package/minizip/Config.in b/package/minizip/Config.in new file mode 100644 index 0000000000..7205e0007e --- /dev/null +++ b/package/minizip/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_MINIZIP + bool "minizip" + select BR2_PACKAGE_ZLIB + help + Enables to extract files from a .zip archive file. + It is compatible with PKZip 2.04g, WinZip, InfoZip, + MimarSinan Codex Suite 2002 tools, and compatible sofware. + + https://github.com/nmoinvaz/minizip + +config BR2_PACKAGE_MINIZIP_DEMOS + bool "miniunzip/minizip" + depends on BR2_PACKAGE_MINIZIP + help + Enable miniunzip/minizip binary tools. diff --git a/package/minizip/minizip.hash b/package/minizip/minizip.hash new file mode 100644 index 0000000000..a303b2c718 --- /dev/null +++ b/package/minizip/minizip.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 b39158bdf3d8bf81d3a7412dc761851fda398bc93d8989d5e940ed4ae5bbb52c minizip-977afb22966e6ab0ee401293a8e85fe808133f9a.tar.gz diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk new file mode 100644 index 0000000000..5b8778615a --- /dev/null +++ b/package/minizip/minizip.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# minizip +# +################################################################################ + +MINIZIP_VERSION = 977afb22966e6ab0ee401293a8e85fe808133f9a +MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION)) +MINIZIP_DEPENDENCIES = zlib +MINIZIP_AUTORECONF = YES +MINIZIP_INSTALL_STAGING = YES +MINIZIP_CONF_OPTS = $(if $(BR2_PACKAGE_MINIZIP_DEMOS),--enable-demos) +MINIZIP_LICENSE = zlib license +MINIZIP_LICENSE_FILES = LICENSE + +$(eval $(autotools-package)) From 0e6ca919f1167415f0ffb690570a8e8e980c5714 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Nov 2015 22:37:24 +0100 Subject: [PATCH 087/132] kmod: bump version to 22 Signed-off-by: Peter Korsgaard --- package/kmod/kmod.hash | 2 +- package/kmod/kmod.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kmod/kmod.hash b/package/kmod/kmod.hash index cf7e802353..75b819e3e3 100644 --- a/package/kmod/kmod.hash +++ b/package/kmod/kmod.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc -sha256 89c1a1a2193c31f9ebe582640bfa2bd401341dc24119f5a7f702588116fadaa0 kmod-20.tar.xz +sha256 ba3b1ddea33228b473189fcb05b809024a3b86e9a7cf37d420cae06beb749f82 kmod-22.tar.xz diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index 3742a032dc..2b9d002939 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -4,7 +4,7 @@ # ################################################################################ -KMOD_VERSION = 20 +KMOD_VERSION = 22 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod KMOD_INSTALL_STAGING = YES From 8e5ec5b9074bd7732c02b891eed5d3db0a442d9e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 23 Nov 2015 22:36:30 +0100 Subject: [PATCH 088/132] sunxi-tools: bump version, add hash Upstream has reworked its build system, so it now supports PREFIX and 'make install', so use those. Notice that the tools have also gained a sunxi- prefix, so use that as well when installing the target variant. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/sunxi-tools/sunxi-tools.hash | 2 ++ package/sunxi-tools/sunxi-tools.mk | 17 ++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 package/sunxi-tools/sunxi-tools.hash diff --git a/package/sunxi-tools/sunxi-tools.hash b/package/sunxi-tools/sunxi-tools.hash new file mode 100644 index 0000000000..c0499cd0ac --- /dev/null +++ b/package/sunxi-tools/sunxi-tools.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 2aa0afc21476ee9b03acff20a19f32c522106e61bcbfa1a9463168fe90a85fc5 sunxi-tools-v1.3.tar.gz diff --git a/package/sunxi-tools/sunxi-tools.mk b/package/sunxi-tools/sunxi-tools.mk index 049af9bf31..4c497c7ba4 100644 --- a/package/sunxi-tools/sunxi-tools.mk +++ b/package/sunxi-tools/sunxi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_TOOLS_VERSION = 82b9c656868d99553f11b1c8853ca808c7ce41ae +SUNXI_TOOLS_VERSION = v1.3 SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,$(SUNXI_TOOLS_VERSION)) SUNXI_TOOLS_LICENSE = GPLv2+ SUNXI_TOOLS_LICENSE_FILES = COPYING @@ -12,25 +12,24 @@ HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb host-pkgconf FEX2BIN = $(HOST_DIR)/usr/bin/fex2bin define HOST_SUNXI_TOOLS_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) PREFIX=$(HOST_DIR)/usr \ CFLAGS="$(HOST_CFLAGS) -std=c99 -D_POSIX_C_SOURCE=200112L -Iinclude/" \ - -C $(@D) + -C $(@D) tools endef define HOST_SUNXI_TOOLS_INSTALL_CMDS - for i in fexc bin2fex fex2bin bootinfo fel pio; do \ - $(INSTALL) -D -m 0755 $(@D)/$$i $(HOST_DIR)/usr/bin/$$i ; \ - done + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) PREFIX=$(HOST_DIR)/usr \ + -C $(@D) install-tools endef define SUNXI_TOOLS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) PREFIX=/usr \ CFLAGS="$(TARGET_CFLAGS) -std=c99 -D_POSIX_C_SOURCE=200112L -Iinclude/" \ - -C $(@D) nand-part + -C $(@D) sunxi-nand-part endef define SUNXI_TOOLS_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/nand-part $(TARGET_DIR)/usr/bin/nand-part + $(INSTALL) -D -m 0755 $(@D)/sunxi-nand-part $(TARGET_DIR)/usr/bin/sunxi-nand-part endef $(eval $(generic-package)) From c091f2333a97127a919a9e77ee09f5dea90a8dd4 Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Tue, 24 Nov 2015 22:45:52 +0100 Subject: [PATCH 089/132] rpcbind: backport adjustment to changes in libtirpc 1.0.1 Signed-off-by: Peter Rosin Signed-off-by: Thomas Petazzoni --- ...n-t-use-the-xp_auth-pointer-directly.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/rpcbind/0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch diff --git a/package/rpcbind/0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch b/package/rpcbind/0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch new file mode 100644 index 0000000000..6145514bea --- /dev/null +++ b/package/rpcbind/0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch @@ -0,0 +1,42 @@ +From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001 +From: Steve Dickson +Date: Mon, 2 Nov 2015 17:05:18 -0500 +Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly + +In the latest libtirpc version to access the xp_auth +one must use the SVC_XP_AUTH macro. To be backwards +compatible a couple ifdefs were added to use the +macro when it exists. + +Signed-off-by: Steve Dickson +[peda@axentia.se: backport from upstream] +Signed-off-by: Peter Rosin +--- + src/rpcb_svc_com.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c +index 4ae93f1..22d6c84 100644 +--- a/src/rpcb_svc_com.c ++++ b/src/rpcb_svc_com.c +@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt) + a.rmt_localvers = fi->versnum; + + xprt_set_caller(xprt, fi); ++#if defined(SVC_XP_AUTH) ++ SVC_XP_AUTH(xprt) = svc_auth_none; ++#else + xprt->xp_auth = &svc_auth_none; ++#endif + svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a); ++#if !defined(SVC_XP_AUTH) + SVCAUTH_DESTROY(xprt->xp_auth); + xprt->xp_auth = NULL; ++#endif ++ + done: + if (buffer) + free(buffer); +-- +2.5.3 + From 7c91721dee30dbed4e3909dc3feff3bc46d166f5 Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Tue, 24 Nov 2015 22:45:53 +0100 Subject: [PATCH 090/132] libtirpc: bump to version 1.0.1 Adjust patch 0001 to trivial changes. Adjust patch 0007 to remove new DES things. Add patch 0008 directly from upstream to fix a late problem in the 1.0.1 release. Signed-off-by: Peter Rosin Signed-off-by: Thomas Petazzoni --- ...parts-of-TIRPC-requiring-NIS-support.patch | 14 +-- ...Disable-DES-authentification-support.patch | 93 +++++++++++++++++-- ...sing-rwlock_unlocks-in-xprt_register.patch | 63 +++++++++++++ package/libtirpc/libtirpc.hash | 4 +- package/libtirpc/libtirpc.mk | 2 +- 5 files changed, 157 insertions(+), 19 deletions(-) create mode 100644 package/libtirpc/0008-Add-missing-rwlock_unlocks-in-xprt_register.patch diff --git a/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch b/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch index 7f58ab36aa..e51c5a44b2 100644 --- a/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch +++ b/package/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch @@ -11,6 +11,8 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" [joerg.krause@embedded.rocks: update for 0.3.2] Signed-off-by: Jörg Krause +[peda@axentia.se: update for 1.0.1] +Signed-off-by: Peter Rosin --- src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) @@ -19,23 +21,23 @@ diff --git a/src/Makefile.am b/src/Makefile.am index 6cc567a..9834f9a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -51,7 +51,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln - rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ +@@ -24,7 +24,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ + svc_auth_des.c \ svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ - auth_time.c auth_des.c authdes_prot.c debug.c + auth_des.c authdes_prot.c debug.c ## XDR - libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c -@@ -68,8 +68,8 @@ if GSS + libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c +@@ -41,8 +41,8 @@ if GSS libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) endif -libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c --libtirpc_la_SOURCES += netname.c netnamer.c rtime.c +-libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c +#libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c -+#libtirpc_la_SOURCES += netname.c netnamer.c rtime.c ++#libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c CLEANFILES = cscope.* *~ DISTCLEANFILES = Makefile.in diff --git a/package/libtirpc/0007-Disable-DES-authentification-support.patch b/package/libtirpc/0007-Disable-DES-authentification-support.patch index c25181158b..59a77ffc1d 100644 --- a/package/libtirpc/0007-Disable-DES-authentification-support.patch +++ b/package/libtirpc/0007-Disable-DES-authentification-support.patch @@ -9,6 +9,8 @@ Content-Transfer-Encoding: 8bit uClibc and musl does not provide DES authentication. Signed-off-by: Jörg Krause +[peda@axentia.se: update for 1.0.1] +Signed-off-by: Peter Rosin --- src/Makefile.am | 2 +- src/rpc_soc.c | 32 -------------------------------- @@ -18,20 +20,43 @@ diff --git a/src/Makefile.am b/src/Makefile.am index 960a522..3a88e31 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -51,7 +51,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln +@@ -22,9 +22,8 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln + pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \ rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ +- svc_auth_des.c \ svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ - auth_des.c authdes_prot.c debug.c + debug.c ## XDR - libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c + libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c +diff --git a/src/svc_auth.c b/src/svc_auth.c +--- a/src/svc_auth.c ++++ b/src/svc_auth.c +@@ -114,9 +114,6 @@ _gss_authenticate(rqst, msg, no_dispatch) + case AUTH_SHORT: + dummy = _svcauth_short(rqst, msg); + return (dummy); +- case AUTH_DES: +- dummy = _svcauth_des(rqst, msg); +- return (dummy); + #ifdef HAVE_RPCSEC_GSS + case RPCSEC_GSS: + dummy = _svcauth_gss(rqst, msg, no_dispatch); diff --git a/src/rpc_soc.c b/src/rpc_soc.c index e146ed4..161a1ec 100644 --- a/src/rpc_soc.c +++ b/src/rpc_soc.c -@@ -521,38 +521,6 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult) +@@ -61,7 +61,6 @@ #ifdef PORTMAP + #include + #include + #include +-#include + + #include "rpc_com.h" + +@@ -522,86 +521,6 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult) } /* @@ -45,7 +70,6 @@ index e146ed4..161a1ec 100644 - struct sockaddr *syncaddr; /* optional hostaddr to sync with */ - des_block *ckey; /* optional conversation key to use */ -{ -- AUTH *dummy; - AUTH *nauth; - char hostname[NI_MAXHOST]; - @@ -54,18 +78,67 @@ index e146ed4..161a1ec 100644 - * Change addr to hostname, because that is the way - * new interface takes it. - */ -- if (getnameinfo(syncaddr, sizeof(syncaddr), hostname, -- sizeof hostname, NULL, 0, 0) != 0) -- goto fallback; -- +- switch (syncaddr->sa_family) { +- case AF_INET: +- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname, +- sizeof hostname, NULL, 0, 0) != 0) +- goto fallback; +- break; +- case AF_INET6: +- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in6), hostname, +- sizeof hostname, NULL, 0, 0) != 0) +- goto fallback; +- break; +- default: +- goto fallback; +- } - nauth = authdes_seccreate(servername, window, hostname, ckey); - return (nauth); - } -fallback: -- dummy = authdes_seccreate(servername, window, NULL, ckey); -- return (dummy); +- return authdes_seccreate(servername, window, NULL, ckey); -} - +-/* +- * Create the client des authentication object. Obsoleted by +- * authdes_pk_seccreate(). +- */ +-extern AUTH *authdes_pk_seccreate(const char *, netobj *, u_int, const char *, +- const des_block *, nis_server *); +- +-AUTH * +-authdes_pk_create(servername, pkey, window, syncaddr, ckey) +- char *servername; /* network name of server */ +- netobj *pkey; /* public key */ +- u_int window; /* time to live */ +- struct sockaddr *syncaddr; /* optional hostaddr to sync with */ +- des_block *ckey; /* optional conversation key to use */ +-{ +- AUTH *nauth; +- char hostname[NI_MAXHOST]; +- +- if (syncaddr) { +- /* +- * Change addr to hostname, because that is the way +- * new interface takes it. +- */ +- switch (syncaddr->sa_family) { +- case AF_INET: +- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname, +- sizeof hostname, NULL, 0, 0) != 0) +- goto fallback; +- break; +- default: +- goto fallback; +- } +- nauth = authdes_pk_seccreate(servername, pkey, window, hostname, ckey, NULL); +- return (nauth); +- } +-fallback: +- return authdes_pk_seccreate(servername, pkey, window, NULL, ckey, NULL); +-} +- +- -/* * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() */ diff --git a/package/libtirpc/0008-Add-missing-rwlock_unlocks-in-xprt_register.patch b/package/libtirpc/0008-Add-missing-rwlock_unlocks-in-xprt_register.patch new file mode 100644 index 0000000000..56b5bf8392 --- /dev/null +++ b/package/libtirpc/0008-Add-missing-rwlock_unlocks-in-xprt_register.patch @@ -0,0 +1,63 @@ +From 4f1503e84b2f7bd229a097335e52fb8203f5bb0b Mon Sep 17 00:00:00 2001 +From: Michael Forney +Date: Wed, 4 Nov 2015 13:58:06 -0500 +Subject: [PATCH] Add missing rwlock_unlocks in xprt_register + +It looks like in b2c9430f46c4ac848957fb8adaac176a3f6ac03f when svc_run +switched to poll, an early return was added, but the rwlock was not +unlocked. + +I observed that rpcbind built against libtirpc-1.0.1 would handle only +one request before hanging, and tracked it down to a missing +rwlock_unlock here. + +Fixes: b2c9430f46c4 ('Use poll() instead of select() in svc_run()') +Signed-off-by: Michael Forney +Signed-off-by: Steve Dickson +[peda@axentia.se: backport from upstream] +Signed-off-by: Peter Rosin +--- + src/svc.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/svc.c b/src/svc.c +index 9c41445..b59467b 100644 +--- a/src/svc.c ++++ b/src/svc.c +@@ -99,7 +99,7 @@ xprt_register (xprt) + { + __svc_xports = (SVCXPRT **) calloc (_rpc_dtablesize(), sizeof (SVCXPRT *)); + if (__svc_xports == NULL) +- return; ++ goto unlock; + } + if (sock < _rpc_dtablesize()) + { +@@ -120,14 +120,14 @@ xprt_register (xprt) + svc_pollfd[i].fd = sock; + svc_pollfd[i].events = (POLLIN | POLLPRI | + POLLRDNORM | POLLRDBAND); +- return; ++ goto unlock; + } + + new_svc_pollfd = (struct pollfd *) realloc (svc_pollfd, + sizeof (struct pollfd) + * (svc_max_pollfd + 1)); + if (new_svc_pollfd == NULL) /* Out of memory */ +- return; ++ goto unlock; + svc_pollfd = new_svc_pollfd; + ++svc_max_pollfd; + +@@ -135,6 +135,7 @@ xprt_register (xprt) + svc_pollfd[svc_max_pollfd - 1].events = (POLLIN | POLLPRI | + POLLRDNORM | POLLRDBAND); + } ++unlock: + rwlock_unlock (&svc_fd_lock); + } + +-- +2.5.3 + diff --git a/package/libtirpc/libtirpc.hash b/package/libtirpc/libtirpc.hash index f171870eef..cd65164cb2 100644 --- a/package/libtirpc/libtirpc.hash +++ b/package/libtirpc/libtirpc.hash @@ -1,4 +1,4 @@ # From sourceforge's info on download page: -sha1 af9b74d0c4d1499a7b1a43e396e5b7d62180ea65 libtirpc-0.3.2.tar.bz2 +sha1 8da1636f98b5909c0d587e7534bc1e91f5c1a970 libtirpc-1.0.1.tar.bz2 # Locally computed -sha256 2008a379f37f2c5d5a87a568b06707422cc3e4f5da305f7fb71f3f4c6d473ffc libtirpc-0.3.2.tar.bz2 +sha256 5156974f31be7ccbc8ab1de37c4739af6d9d42c87b1d5caf4835dda75fcbb89e libtirpc-1.0.1.tar.bz2 diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index 8f49356f95..70a31ac59f 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTIRPC_VERSION = 0.3.2 +LIBTIRPC_VERSION = 1.0.1 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3c From dfcbcce4d086a2d220275646870f8119f6aa7e48 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 25 Nov 2015 11:19:22 +0000 Subject: [PATCH 091/132] xfsprogs: bump version to 4.3.0 - Bump version to 4.3.0 - Update hash value - Add new mandatory blkid dependency - Remove upstreamed patch: 0001-xfsprogs-replaces-static-with-static-libtool-libs.patch - Add new patch which has been sent upstream: 0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- ...-do-dynamic-linking-of-libtool-libra.patch | 40 ++++++ ...aces-static-with-static-libtool-libs.patch | 129 ------------------ package/xfsprogs/Config.in | 1 + package/xfsprogs/xfsprogs.hash | 4 +- package/xfsprogs/xfsprogs.mk | 2 +- 5 files changed, 44 insertions(+), 132 deletions(-) create mode 100644 package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch delete mode 100644 package/xfsprogs/0001-xfsprogs-replaces-static-with-static-libtool-libs.patch diff --git a/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch b/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch new file mode 100644 index 0000000000..3f79dbbe99 --- /dev/null +++ b/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch @@ -0,0 +1,40 @@ +mdrestore: do not do dynamic linking of libtool libraries + +This patch has been sent upstream: + + http://oss.sgi.com/pipermail/xfs/2015-November/045136.html + +Signed-off-by: Vicente Olivert Riera + +From a406326f724006d62085a0aeae1072b4145caa9d Mon Sep 17 00:00:00 2001 +From: Vicente Olivert Riera +Date: Wed, 25 Nov 2015 10:50:00 +0000 +Subject: [PATCH] mdrestore: do not do dynamic linking of libtool libraries + +As explained in commit ece49daeff1a3cad765e106d678c608925c9d768, use +-static-libtool-libs instead of -static to allow fallback to the dynamic +linking for libuuid only. Otherwise the build will fail like this: + +ld: attempted static link of dynamic object `/usr/lib/libuuid.so' + +Signed-off-by: Vicente Olivert Riera +--- + mdrestore/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mdrestore/Makefile b/mdrestore/Makefile +index 5171306..1b34a0e 100644 +--- a/mdrestore/Makefile ++++ b/mdrestore/Makefile +@@ -10,7 +10,7 @@ CFILES = xfs_mdrestore.c + + LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) $(LIBUUID) + LTDEPENDENCIES = $(LIBXFS) +-LLDFLAGS = -static ++LLDFLAGS = -static-libtool-libs + + default: depend $(LTCOMMAND) + +-- +2.4.10 + diff --git a/package/xfsprogs/0001-xfsprogs-replaces-static-with-static-libtool-libs.patch b/package/xfsprogs/0001-xfsprogs-replaces-static-with-static-libtool-libs.patch deleted file mode 100644 index 53bd96c0b4..0000000000 --- a/package/xfsprogs/0001-xfsprogs-replaces-static-with-static-libtool-libs.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 837e0a3bfe4b414a48c77aaf930b5e04b4e2c5e5 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 16 Dec 2014 22:06:26 +0100 -Subject: [PATCH 1/1] xfsprogs: replaces -static with -static-libtool-libs - -xfsprogs relies on the original behaviour of -static which was -modified by [1]. But since commit [2] the build of xfsprogs tools is -broken because they try to link statically with the static libuuid -library (util-linux), which is not built for shared only builds. - -The use of -static-libtool-libs allows to fallback to the dynamic -linking for libuuid only: - -LD_TRACE_LOADED_OBJECTS=1 xfs_copy - linux-gate.so.1 => (0xf7793000) - libuuid.so.1 => /lib/libuuid.so.1 (0x465e1000) - libpthread.so.0 => /lib/libpthread.so.0 (0x46db1000) - librt.so.1 => /lib/librt.so.1 (0x46f21000) - libc.so.6 => /lib/libc.so.6 (0x46bf1000) - /lib/ld-linux.so.2 (0x46bce000) - -[1] http://git.buildroot.net/buildroot/commit/?id=97703978ac870ce2b14ad144f8e082de82aa2c64 -[2] http://git.buildroot.net/buildroot/commit/?id=f1d3e09895b245da9d54bbaef36e5de95269034e - -Signed-off-by: Romain Naour ---- - copy/Makefile | 2 +- - db/Makefile | 2 +- - growfs/Makefile | 2 +- - io/Makefile | 2 +- - logprint/Makefile | 2 +- - mkfs/Makefile | 2 +- - repair/Makefile | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/copy/Makefile b/copy/Makefile -index 54f6dfb..beabbd4 100644 ---- a/copy/Makefile -+++ b/copy/Makefile -@@ -11,7 +11,7 @@ HFILES = xfs_copy.h - - LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBPTHREAD) $(LIBRT) - LTDEPENDENCIES = $(LIBXFS) --LLDFLAGS = -static -+LLDFLAGS = -static-libtool-libs - - default: depend $(LTCOMMAND) - -diff --git a/db/Makefile b/db/Makefile -index 5c7d054..b4c49c6 100644 ---- a/db/Makefile -+++ b/db/Makefile -@@ -18,7 +18,7 @@ LSRCFILES = xfs_admin.sh xfs_check.sh xfs_ncheck.sh xfs_metadump.sh - - LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) - LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG) --LLDFLAGS += -static -+LLDFLAGS += -static-libtool-libs - - ifeq ($(ENABLE_READLINE),yes) - LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP) -diff --git a/growfs/Makefile b/growfs/Makefile -index 88cbf4f..19616de 100644 ---- a/growfs/Makefile -+++ b/growfs/Makefile -@@ -19,7 +19,7 @@ LLDLIBS += $(LIBEDITLINE) $(LIBTERMCAP) - endif - - LTDEPENDENCIES = $(LIBXFS) $(LIBXCMD) --LLDFLAGS = -static -+LLDFLAGS = -static-libtool-libs - LSRCFILES = xfs_info.sh - - default: depend $(LTCOMMAND) -diff --git a/io/Makefile b/io/Makefile -index 50edf91..89b465b 100644 ---- a/io/Makefile -+++ b/io/Makefile -@@ -14,7 +14,7 @@ CFILES = init.c \ - - LLDLIBS = $(LIBXCMD) $(LIBHANDLE) - LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE) --LLDFLAGS = -static -+LLDFLAGS = -static-libtool-libs - - ifeq ($(HAVE_FADVISE),yes) - CFILES += fadvise.c -diff --git a/logprint/Makefile b/logprint/Makefile -index 2d656a4..7bcf27f 100644 ---- a/logprint/Makefile -+++ b/logprint/Makefile -@@ -14,7 +14,7 @@ CFILES = logprint.c \ - - LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) - LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG) --LLDFLAGS = -static -+LLDFLAGS = -static-libtool-libs - - default: depend $(LTCOMMAND) - -diff --git a/mkfs/Makefile b/mkfs/Makefile -index 75da633..fd1f615 100644 ---- a/mkfs/Makefile -+++ b/mkfs/Makefile -@@ -21,7 +21,7 @@ endif - - LLDLIBS += $(LIBXFS) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) - LTDEPENDENCIES += $(LIBXFS) --LLDFLAGS = -static -+LLDFLAGS = -static-libtool-libs - - LSRCFILES = $(FSTYP).c - LDIRT = $(FSTYP) -diff --git a/repair/Makefile b/repair/Makefile -index b0e03f8..e9db30f 100644 ---- a/repair/Makefile -+++ b/repair/Makefile -@@ -22,7 +22,7 @@ CFILES = agheader.c attr_repair.c avl.c avl64.c bmap.c btree.c \ - - LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) - LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG) --LLDFLAGS = -static -+LLDFLAGS = -static-libtool-libs - - default: depend $(LTCOMMAND) - --- -1.9.3 - diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in index 099863795d..2c24cbbc1c 100644 --- a/package/xfsprogs/Config.in +++ b/package/xfsprogs/Config.in @@ -12,6 +12,7 @@ config BR2_PACKAGE_XFSPROGS depends on BR2_USE_WCHAR # util-linux select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID help The XFS file system utilities and libraries diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index 3fb02df492..d0ff1f3145 100644 --- a/package/xfsprogs/xfsprogs.hash +++ b/package/xfsprogs/xfsprogs.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature: -# ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-3.1.11.tar.gz.sig -sha256 adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be xfsprogs-3.1.11.tar.gz +# ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-4.3.0.tar.gz.sig +sha256 3e570ad51153e4be3792f42b2c805ddbd46b55d166eba3102ec87d5006d4cb5c xfsprogs-4.3.0.tar.gz diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 209a49b23b..30c47775cb 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -XFSPROGS_VERSION = 3.1.11 +XFSPROGS_VERSION = 4.3.0 XFSPROGS_SITE = ftp://oss.sgi.com/projects/xfs/cmd_tars XFSPROGS_DEPENDENCIES = util-linux From 08e06ababeb17c79b0fe4927e258e05e14bf223a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 25 Nov 2015 15:38:06 -0300 Subject: [PATCH 092/132] harfbuzz: bump to version 1.1.1 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 3772242ef8..e15cc17bc5 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.0.tar.bz2.sha256 -sha256 0f584a5947e60ede565e7a4e122baa5e4b17a62eab872abf5f73d8552ceb716b harfbuzz-1.1.0.tar.bz2 +# From http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.1.1.tar.bz2.sha256 +sha256 0c366a77276fa69d40006cf8a2f2dbcd82f3fb406f3960c3c3a0d34dd3a0f06c harfbuzz-1.1.1.tar.bz2 diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 703e15cc0d..8251e1fe6c 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 1.1.0 +HARFBUZZ_VERSION = 1.1.1 HARFBUZZ_SITE = http://www.freedesktop.org/software/harfbuzz/release HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 02bd8520e801bc1adb4120c8c05a8cfba9090ab3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 25 Nov 2015 19:44:27 -0300 Subject: [PATCH 093/132] memcached: bump to version 1.4.25 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/memcached/memcached.hash | 6 ++++-- package/memcached/memcached.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index 55376cec03..ed330cff1d 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,2 +1,4 @@ -# From http://www.memcached.org/files/memcached-1.4.24.tar.gz.sha1 -sha1 32a798a37ef782da10a09d74aa1e5be91f2861db memcached-1.4.24.tar.gz +# From http://www.memcached.org/files/memcached-1.4.25.tar.gz.sha1 +sha1 7fd0ba9283c61204f196638ecf2e9295688b2314 memcached-1.4.25.tar.gz +# Calculated based on the hash above +sha256 f058437b3c224d321919a9a6bb4e3eedb2312ed718c0caf087ff2f04ab795dda memcached-1.4.25.tar.gz diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index 2d39bd87cc..b0753e4a32 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.4.24 +MEMCACHED_VERSION = 1.4.25 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From df25b501a5d17211ac67833a53f636e84511a716 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 26 Nov 2015 14:42:03 -0500 Subject: [PATCH 094/132] lttng-tools: bump to version 2.7.0 0001-Fix-Mark-MI-and-Config-string-declarations-as-extern.patch is gone with commit 4965f956f3ef47388fb4a1b2f8f504abfe31afe7. Signed-off-by: Philippe Proulx Signed-off-by: Peter Korsgaard --- package/lttng-tools/lttng-tools.hash | 2 +- package/lttng-tools/lttng-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lttng-tools/lttng-tools.hash b/package/lttng-tools/lttng-tools.hash index a356911d55..94e389f1c6 100644 --- a/package/lttng-tools/lttng-tools.hash +++ b/package/lttng-tools/lttng-tools.hash @@ -1,2 +1,2 @@ # Locally generated -sha256 128166445126d76da7d9f42a56dec12716732a1ed697a6cfdf40c9e135384f32 lttng-tools-2.6.0.tar.bz2 +sha256 261d1b60ef0f451be42df70f019b24fda9130372e326e7bdba3e3ffab7ca0c40 lttng-tools-2.7.0.tar.bz2 diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index 0cd381c893..efca6d7ae4 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.6.0 +LTTNG_TOOLS_VERSION = 2.7.0 LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_LICENSE = GPLv2+; LGPLv2.1+ for include/lttng/* and src/lib/lttng-ctl/* From 5d2e7e4e38842a383457fdfe43397653e6ee1f4d Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 26 Nov 2015 14:42:04 -0500 Subject: [PATCH 095/132] lttng-libust: bump to version 2.7.1 Signed-off-by: Philippe Proulx Signed-off-by: Peter Korsgaard --- package/lttng-libust/lttng-libust.hash | 4 ++-- package/lttng-libust/lttng-libust.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lttng-libust/lttng-libust.hash b/package/lttng-libust/lttng-libust.hash index aafc2ba906..57c7e003ae 100644 --- a/package/lttng-libust/lttng-libust.hash +++ b/package/lttng-libust/lttng-libust.hash @@ -1,2 +1,2 @@ -# http://www.lttng.org/files/lttng-ust/lttng-ust-2.6.2.tar.bz2.sha1 -sha1 bfa9cbdabd8698cf5b98667eac5c39775127f634 lttng-ust-2.6.2.tar.bz2 +# http://www.lttng.org/files/lttng-ust/lttng-ust-2.7.1.tar.bz2.sha1 +sha1 597ebecb885debb58c263de57f30b1096d4eefc6 lttng-ust-2.7.1.tar.bz2 diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index 4976ff4475..cfd23676ea 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -5,7 +5,7 @@ ################################################################################ LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust -LTTNG_LIBUST_VERSION = 2.6.2 +LTTNG_LIBUST_VERSION = 2.7.1 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_LICENSE = LGPLv2.1; MIT for system headers; GPLv2 for liblttng-ust-ctl/ustctl.c (used by lttng-sessiond) LTTNG_LIBUST_LICENSE_FILES = COPYING From c2be38b9e3bee22129b9da160a8d131ce4e1efac Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 26 Nov 2015 14:42:05 -0500 Subject: [PATCH 096/132] lttng-modules: bump to version 2.7.0 [Peter: drop extra whitespace in .hash file] Signed-off-by: Philippe Proulx Signed-off-by: Peter Korsgaard --- package/lttng-modules/lttng-modules.hash | 4 ++-- package/lttng-modules/lttng-modules.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lttng-modules/lttng-modules.hash b/package/lttng-modules/lttng-modules.hash index 918b4cfc7a..b94d910dc0 100644 --- a/package/lttng-modules/lttng-modules.hash +++ b/package/lttng-modules/lttng-modules.hash @@ -1,2 +1,2 @@ -# http://www.lttng.org/files/lttng-modules/lttng-modules-2.6.0.tar.bz2.sha1 -sha1 6402ec848e2a75250e04be35f0c49332bf37a388 lttng-modules-2.6.0.tar.bz2 +# http://www.lttng.org/files/lttng-modules/lttng-modules-2.7.0.tar.bz2.sha1 +sha1 b98b85cd71c03d511b37790644353c7209bcadd4 lttng-modules-2.7.0.tar.bz2 diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk index 30c581e33e..19c0a5d9b5 100644 --- a/package/lttng-modules/lttng-modules.mk +++ b/package/lttng-modules/lttng-modules.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.6.0 +LTTNG_MODULES_VERSION = 2.7.0 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 for kernel modules; MIT for lib/bitfield.h and lib/prio_heap/* From 88308834bea39c7103809043f6e460396abfb80a Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 24 Nov 2015 23:51:52 +0100 Subject: [PATCH 097/132] package/mono: bump to version 4.2.1.102 This patch bumps to version 4.2.1.102 and updates accompaining patches accordingly. * Removed upstreamed patch 0003-fix-parallel-install.patch * Adding patch to fix eglib linking option (upstreamed here https://github.com/mono/mono/pull/1971 but not included in this release) * Adding patch to remove compilation of unit-tests Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/mono/0003-fix-parallel-install.patch | 40 ------------------- ...checking-for-locale_charset-function.patch | 28 +++++++++++++ ...ove-unit-tests-from-mono-compilation.patch | 29 ++++++++++++++ package/mono/Config.in | 1 - package/mono/mono.hash | 2 +- package/mono/mono.mk | 2 +- 6 files changed, 59 insertions(+), 43 deletions(-) delete mode 100644 package/mono/0003-fix-parallel-install.patch create mode 100644 package/mono/0005-eglib-checking-for-locale_charset-function.patch create mode 100644 package/mono/0006-Remove-unit-tests-from-mono-compilation.patch diff --git a/package/mono/0003-fix-parallel-install.patch b/package/mono/0003-fix-parallel-install.patch deleted file mode 100644 index c151173247..0000000000 --- a/package/mono/0003-fix-parallel-install.patch +++ /dev/null @@ -1,40 +0,0 @@ -mcs: fix installation with parallel make - -In mcs/ the install of xbuild_12 and xbuild_14 will end-up installing -the same files: - ${NETFRAMEWORK_DIR}/v2.0/RedistList/FrameworkList.xml - ${NETFRAMEWORK_DIR}/v3.0/RedistList/FrameworkList.xml - ${NETFRAMEWORK_DIR}/v3.5/RedistList/FrameworkList.xml - ${NETFRAMEWORK_DIR}/v4.0/Profile/Client/RedistList/FrameworkList.xml - ${NETFRAMEWORK_DIR}/v4.0/RedistList/FrameworkList.xml - ${NETFRAMEWORK_DIR}/v4.5.1/RedistList/FrameworkList.xml - ${NETFRAMEWORK_DIR}/v4.5/RedistList/FrameworkList.xml - -This is because there is no atomicity when installing each file, and -xbuild_12 and xbuild_14 may well run in parallel, each trying to install -each of those files; but the 'install' utility will first check if the -target file exists or not, and behaves differently if it does than if it -does not, thus leading to build failures like so: - http://autobuild.buildroot.org/results/c32/c3288c5d1fb94474f14a4a889e76135878d403bc/build-end.log - -So, ensure ordering of the install of xbuild_12 and xbuild_14 (the -ordering is completely arbitrary, either way gives the same installed -files). - -Signed-off-by: "Yann E. MORIN" -Cc: Angelo Compagnucci - -diff -durN host-mono-4.0.0.orig/mcs/Makefile host-mono-4.0.0/mcs/Makefile ---- host-mono-4.0.0.orig/mcs/Makefile 2015-04-09 16:55:53.000000000 +0200 -+++ host-mono-4.0.0/mcs/Makefile 2015-05-16 17:25:44.475542483 +0200 -@@ -43,6 +43,10 @@ - profile-do--%: - $(MAKE) PROFILE=$(subst --, ,$*) - -+# xbuild_12 and xbuild_14 will try to install the same files, so they need -+# to be ordered -+profile-do--xbuild_14--install: profile-do--xbuild_12--install -+ - # We don't want to run the tests in parallel. We want behaviour like -k. - profiles-do--run-test: - ret=:; $(foreach p,$(PROFILES), { $(MAKE) PROFILE=$(p) run-test || ret=false; }; ) $$ret diff --git a/package/mono/0005-eglib-checking-for-locale_charset-function.patch b/package/mono/0005-eglib-checking-for-locale_charset-function.patch new file mode 100644 index 0000000000..52d5638451 --- /dev/null +++ b/package/mono/0005-eglib-checking-for-locale_charset-function.patch @@ -0,0 +1,28 @@ +From 026a8c44d332b3595814ce0aceba255467cd7b6d Mon Sep 17 00:00:00 2001 +From: Angelo Compagnucci +Date: Sat, 5 Sep 2015 08:57:21 +0200 +Subject: [PATCH] eglib: checking for locale_charset function + +This patch checks if locale_charset function is availabe in +libiconv or libcharset and changes the linking options accordingly. + +Signed-off-by: Angelo Compagnucci +--- + eglib/configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/eglib/configure.ac b/eglib/configure.ac +index 9d094ea..5ea220e 100644 +--- a/eglib/configure.ac ++++ b/eglib/configure.ac +@@ -182,6 +182,7 @@ fi + AC_SUBST(G_HAVE_ISO_VARARGS) + + AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h sys/resource.h) ++AC_CHECK_LIB([iconv], [locale_charset],[],[AC_CHECK_LIB([charset], [locale_charset],[LIBS+="-liconv -lcharset"])]) + AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0]) + AC_SUBST(HAVE_ALLOCA_H) + +-- +1.9.1 + diff --git a/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch b/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch new file mode 100644 index 0000000000..3714b65821 --- /dev/null +++ b/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch @@ -0,0 +1,29 @@ +From 155f96953d1b898f04a4e708c9ebc1e450b2f63e Mon Sep 17 00:00:00 2001 +From: Angelo Compagnucci +Date: Tue, 24 Nov 2015 23:11:10 +0100 +Subject: [PATCH] Remove unit-tests from mono compilation + +This patch fixes compiling errors with unit-tests under linux. + +Signed-off-by: Angelo Compagnucci +--- + mono/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mono/Makefile.am b/mono/Makefile.am +index ef41dfe..7129507 100644 +--- a/mono/Makefile.am ++++ b/mono/Makefile.am +@@ -30,7 +30,7 @@ monotouch-do-clean: + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \ + done; + else +-SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler ++SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler + endif + endif +-DIST_SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler ++DIST_SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler +-- +1.9.1 + diff --git a/package/mono/Config.in b/package/mono/Config.in index 0f57703ec9..cf18a033cb 100644 --- a/package/mono/Config.in +++ b/package/mono/Config.in @@ -8,7 +8,6 @@ config BR2_PACKAGE_MONO depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help An open source, cross-platform, implementation of C# and the CLR that is binary compatible with Microsoft.NET. diff --git a/package/mono/mono.hash b/package/mono/mono.hash index cf8e0d5b1a..001f6be7e0 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 b074584eea5bbaaf29362486a69d70abe53d0d2feb334f231fa9c841cf6fd651 mono-4.0.2.5.tar.bz2 +sha256 b7b461fe04375f621d88166ba8c6f1cb33c439fd3e17136460f7d087a51ed792 mono-4.2.1.102.tar.bz2 diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 8668aa0d05..8f99983377 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONO_VERSION = 4.0.2.5 +MONO_VERSION = 4.2.1.102 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 c423a91b9596b77550a7ea2b004b0e8b31ebb725 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 24 Nov 2015 23:51:53 +0100 Subject: [PATCH 098/132] package/monolite: bump to version 138 This patch bump to version 138 needed for mono 4.2.1.102 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/monolite/monolite.hash | 2 +- package/monolite/monolite.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/monolite/monolite.hash b/package/monolite/monolite.hash index 1139c0af10..fa098e266d 100644 --- a/package/monolite/monolite.hash +++ b/package/monolite/monolite.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 07a8573feef0053ec28b98355feba8c83dcfb3f99c2d0913a16a287382daf4b8 monolite-117-latest.tar.gz +sha256 0cf7aeafb22daeb7ed3398057f0ac88015440901f480ef84cba2431a753f8c1e monolite-138-latest.tar.gz diff --git a/package/monolite/monolite.mk b/package/monolite/monolite.mk index aa6c28cd12..3c53bff5aa 100644 --- a/package/monolite/monolite.mk +++ b/package/monolite/monolite.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONOLITE_VERSION = 117 +MONOLITE_VERSION = 138 MONOLITE_SITE = http://storage.bos.xamarin.com/mono-dist-master/latest MONOLITE_SOURCE = monolite-$(MONOLITE_VERSION)-latest.tar.gz MONOLITE_LICENSE = LGPLv2 or commercial From 218938e470c74d84e79ded2b2cbaba893e2af199 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 27 Nov 2015 16:19:47 +0100 Subject: [PATCH 099/132] opus: bump version to 1.1.1 And drop now upstreamed patch. Signed-off-by: Peter Korsgaard --- ...bashism-in-ARM-optimization-handling.patch | 43 ------------------- package/opus/opus.hash | 2 +- package/opus/opus.mk | 2 +- 3 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 package/opus/0001-configure.ac-fix-bashism-in-ARM-optimization-handling.patch diff --git a/package/opus/0001-configure.ac-fix-bashism-in-ARM-optimization-handling.patch b/package/opus/0001-configure.ac-fix-bashism-in-ARM-optimization-handling.patch deleted file mode 100644 index 80b9dfc6f8..0000000000 --- a/package/opus/0001-configure.ac-fix-bashism-in-ARM-optimization-handling.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a3d4f4f2385394b822b8f66342de8a1e3b4217bb Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sun, 8 Dec 2013 10:54:25 +0100 -Subject: [PATCH] configure.ac: fix bashism in ARM optimization handling - -Submitted upstream: -http://lists.xiph.org/pipermail/opus/2013-December/002422.html - -Breaks configure when /bin/sh isn't bash with: - -configure: Trying to force-enable ARMv6 media instructions... -checking if assembler supports ARMv6 media instructions on ARM... yes -configure: Trying to force-enable NEON instructions... -checking if assembler supports NEON instructions on ARM... yes -./configure.lineno: 12799: Bad substitution - -Fix it by using the %% expansion to remove everything from the first -space instead. - -Signed-off-by: Peter Korsgaard ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0ba4a80..443362f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -333,9 +333,9 @@ AS_IF([test x"${enable_asm}" = x"yes"],[ - - AM_CONDITIONAL([CPU_ARM], [test "$cpu_arm" = "yes"]) - AM_CONDITIONAL([OPUS_ARM_INLINE_ASM], -- [test x"${inline_optimization:0:3}" = x"ARM"]) -+ [test x"${inline_optimization%% *}" = x"ARM"]) - AM_CONDITIONAL([OPUS_ARM_EXTERNAL_ASM], -- [test x"${asm_optimization:0:3}" = x"ARM"]) -+ [test x"${asm_optimization%% *}" = x"ARM"]) - - AS_IF([test x"$enable_rtcd" = x"yes"],[ - AS_IF([test x"$rtcd_support" != x"no"],[ --- -1.8.4.rc3 - diff --git a/package/opus/opus.hash b/package/opus/opus.hash index 9c4e34dd7d..b3aea0d507 100644 --- a/package/opus/opus.hash +++ b/package/opus/opus.hash @@ -1,2 +1,2 @@ # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt -sha256 b9727015a58affcf3db527322bf8c4d2fcf39f5f6b8f15dbceca20206cbe1d95 opus-1.1.tar.gz +sha256 9b84ff56bd7720d5554103c557664efac2b8b18acc4bbcc234cb881ab9a3371e opus-1.1.1.tar.gz diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 8e6f8853b4..c4fef3a9f0 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPUS_VERSION = 1.1 +OPUS_VERSION = 1.1.1 OPUS_SITE = http://downloads.xiph.org/releases/opus OPUS_LICENSE = BSD-3c OPUS_LICENSE_FILES = COPYING From d21e5cfc443fe699501c16c4008c50083f1e7d69 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 28 Nov 2015 12:52:19 +0100 Subject: [PATCH 100/132] package/swig: bump version to 3.0.7 This patch bumps the swig package to the current major release, the comment about the CMake fix was also updated to reflect the version bump. Swig 3.0.7 was positively tested using this defconfig: BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_KODI=y BR2_PACKAGE_KODI_LIBCEC=y BR2_PACKAGE_TRACE_CMD=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_LIBFTDI1=y BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS=y BR2_PACKAGE_LIBSEMANAGE=y BR2_PACKAGE_GNURADIO=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/swig/swig.hash | 2 +- package/swig/swig.mk | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/package/swig/swig.hash b/package/swig/swig.hash index 98baaa26e7..62e3d20f68 100644 --- a/package/swig/swig.hash +++ b/package/swig/swig.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7 swig-2.0.12.tar.gz +sha256 06dc8816a225667ce1eee545af3caf87e1bbaa379c32838d4cea53152514348d swig-3.0.7.tar.gz diff --git a/package/swig/swig.mk b/package/swig/swig.mk index 6b9b8aebcb..cd816b4822 100644 --- a/package/swig/swig.mk +++ b/package/swig/swig.mk @@ -4,8 +4,8 @@ # ################################################################################ -SWIG_VERSION_MAJOR = 2.0 -SWIG_VERSION = $(SWIG_VERSION_MAJOR).12 +SWIG_VERSION_MAJOR = 3.0 +SWIG_VERSION = $(SWIG_VERSION_MAJOR).7 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION) SWIG_DEPENDENCIES = host-bison HOST_SWIG_CONF_OPTS = \ @@ -15,14 +15,15 @@ HOST_SWIG_CONF_OPTS = \ SWIG_LICENSE = GPLv3+ BSD-2c BSD-3c SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES -# CMake looks first at swig2.0 and then swig. However, when doing the -# search, it will look into the PATH for swig2.0 first, and then for -# swig. While the PATH contains first our $(HOST_DIR)/usr/bin, it also -# contains /usr/bin and other system directories. Therefore, if there -# is an installed swig2.0 on the system, it will get the preference -# over the swig installed in $(HOST_DIR)/usr/bin, which isn't nice. To -# prevent this from happening we create a symbolic link swig2.0 -> -# swig, so that our swig always gets used. +# CMake looks first at swig3.0, then swig2.0 and then swig. However, +# when doing the search, it will look into the PATH for swig2.0 first, +# and then for swig. +# While the PATH contains first our $(HOST_DIR)/usr/bin, it also contains +# /usr/bin and other system directories. Therefore, if there is an +# installed swig3.0 on the system, it will get the preference over the +# swig installed in $(HOST_DIR)/usr/bin, which isn't nice. To prevent +# this from happening we create a symbolic link swig3.0 -> swig, so that +# our swig always gets used. define HOST_SWIG_INSTALL_SYMLINK ln -fs swig $(HOST_DIR)/usr/bin/swig$(SWIG_VERSION_MAJOR) From f67ffb437566562be47188097f846ade231daf3c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 28 Nov 2015 12:32:20 +0100 Subject: [PATCH 101/132] package/php: bump version to 5.6.16 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index e4a3e737ad..ec632bfd52 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,2 +1,2 @@ # From http://php.net/downloads.php -sha256 cf52e2e621e60997269663fa4bc06253191fa2a41dc9b08c8c911435b3ebcca9 php-5.6.15.tar.xz +sha256 8ef43271d9bd8cc8f8d407d3ba569de9fa14a28985ae97c76085bb50d597de98 php-5.6.16.tar.xz diff --git a/package/php/php.mk b/package/php/php.mk index 76e3d621a4..5f87d0799c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -5,7 +5,7 @@ ################################################################################ PHP_VERSION_MAJOR = 5.6 -PHP_VERSION = $(PHP_VERSION_MAJOR).15 +PHP_VERSION = $(PHP_VERSION_MAJOR).16 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From a2d454a959b4b783010c59bf83a0e6ed479a17a5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 28 Nov 2015 11:13:35 +0100 Subject: [PATCH 102/132] package/ffmpeg: bump version to 2.8.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index e984b58148..d50c2cf359 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d2e61d445397940e24ed5afeccfa2c70484a2db1bdc15614f5eaaf171f1d350e ffmpeg-2.8.2.tar.xz +sha256 18e22e3866d3b5fefcb1911c0d87ae8ababc30b7ea15901c1cf02885ccf6704a ffmpeg-2.8.3.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 988374f74b..dbf3a5ba16 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 2.8.2 +FFMPEG_VERSION = 2.8.3 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From 2cfc966f431c7c715b3fc11ca0467d47432fca33 Mon Sep 17 00:00:00 2001 From: James Knight Date: Fri, 27 Nov 2015 11:25:57 -0500 Subject: [PATCH 103/132] gpsd: enable kpps support GPSD has the ability to support KPPS. Its enablement is determined primarily from the existence of `sys/timepps.h`. This file is provided from the pps-tools package. Adjusting GPSD's Makefile to depend on the pps-tools package if a developer has included pps-tools as part of a build. Signed-off-by: James Knight Signed-off-by: Thomas Petazzoni --- package/gpsd/gpsd.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 87911c3905..30554034b5 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -59,6 +59,12 @@ else GPSD_SCONS_OPTS += bluez=no endif +# If pps-tools is available, build it before so the package can use it +# (HAVE_SYS_TIMEPPS_H). +ifeq ($(BR2_PACKAGE_PPS_TOOLS),y) +GPSD_DEPENDENCIES += pps-tools +endif + ifeq ($(BR2_PACKAGE_DBUS_GLIB),y) GPSD_SCONS_OPTS += dbus_export=yes GPSD_DEPENDENCIES += dbus-glib From b8a834b4170a8769c8e160eebeff72d867386ca5 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 25 Nov 2015 12:18:00 +0000 Subject: [PATCH 104/132] rubix: make the rubix.mk file more readable Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/rubix/rubix.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/package/rubix/rubix.mk b/package/rubix/rubix.mk index dd23edfdd1..b808bc0b87 100644 --- a/package/rubix/rubix.mk +++ b/package/rubix/rubix.mk @@ -7,12 +7,15 @@ RUBIX_VERSION = 1.0.5 RUBIX_SOURCE = rubix-$(RUBIX_VERSION).tar.bz2 RUBIX_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Rubix -RUBIX_INSTALL_TARGET_OPTS = GAMESDIR=$(TARGET_DIR)/usr/games install RUBIX_LICENSE = Public Domain RUBIX_LICENSE_FILES = LICENCE - -RUBIX_MAKE_OPTS = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="-L$(STAGING_DIR)/usr/lib -lX11" - RUBIX_DEPENDENCIES = xlib_libX11 +RUBIX_MAKE_OPTS = \ + CC="$(TARGET_CC)" \ + XINC="-I$(STAGING_DIR)/usr/include/X11" \ + XLIB="-L$(STAGING_DIR)/usr/lib -lX11" + +RUBIX_INSTALL_TARGET_OPTS = GAMESDIR=$(TARGET_DIR)/usr/games install + $(eval $(autotools-package)) From d563c0d5ac76b59379dcc228c02408b2a402b721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 27 Nov 2015 20:53:24 +0100 Subject: [PATCH 105/132] package/luv: bump to version 1.7.4-5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/luv/luv.hash | 2 +- package/luv/luv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luv/luv.hash b/package/luv/luv.hash index 307fc19a9b..31d29c7566 100644 --- a/package/luv/luv.hash +++ b/package/luv/luv.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9ea1c2343e76f653f8e7d3420d2c7718ef4eca67a645a9d17297ae91caa224b5 luv-1.7.4-4.tar.gz +sha256 7f558461225dd57fbc784cd8b4f7ec8270dd1c179e8bdce3f7009c835c828317 luv-1.7.4-5.tar.gz diff --git a/package/luv/luv.mk b/package/luv/luv.mk index a810c634f5..85da7d1ed5 100644 --- a/package/luv/luv.mk +++ b/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.7.4-4 +LUV_VERSION = 1.7.4-5 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt From f0c9470451b23989fe7b298d30352760b1513c37 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Fri, 27 Nov 2015 18:38:00 +0100 Subject: [PATCH 106/132] infozip: rename to zip We currently have a package named "infozip" for Info-Zip's Zip. With the upcoming addition of a package the Info-Zip's UnZip the name is becoming ambiguous. Rename it to the more specific name "zip". Signed-off-by: Luca Ceresoli Cc: Romain Naour Cc: Jan Pedersen Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 12 +++++++ package/Config.in | 2 +- ...-Check-C-compiler-type-optimization-.patch | 0 .../0002-configure-Don-t-use-host-CPP.patch | 0 ...akefile-Use-CFLAGS-from-command-line.patch | 0 ...figure-use-LDFLAGS-from-command-line.patch | 0 ...-configure-remove-GID-UID-size-check.patch | 0 ...e-borrow-the-LFS-test-from-autotools.patch | 0 package/{infozip => zip}/Config.in | 4 +-- .../{infozip/infozip.hash => zip/zip.hash} | 0 package/{infozip/infozip.mk => zip/zip.mk} | 32 +++++++++---------- 11 files changed, 31 insertions(+), 19 deletions(-) rename package/{infozip => zip}/0001-configure-Remove-Check-C-compiler-type-optimization-.patch (100%) rename package/{infozip => zip}/0002-configure-Don-t-use-host-CPP.patch (100%) rename package/{infozip => zip}/0003-Makefile-Use-CFLAGS-from-command-line.patch (100%) rename package/{infozip => zip}/0004-configure-use-LDFLAGS-from-command-line.patch (100%) rename package/{infozip => zip}/0005-unix-configure-remove-GID-UID-size-check.patch (100%) rename package/{infozip => zip}/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch (100%) rename package/{infozip => zip}/Config.in (88%) rename package/{infozip/infozip.hash => zip/zip.hash} (100%) rename package/{infozip/infozip.mk => zip/zip.mk} (66%) diff --git a/Config.in.legacy b/Config.in.legacy index c5b8223cf1..2bbf2ed867 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -104,6 +104,18 @@ comment "build, or run, in unpredictable ways. " comment "----------------------------------------------------" endif +############################################################################### +comment "Legacy options removed in 2016.02" + +config BR2_PACKAGE_INFOZIP + bool "infozip option has been renamed to zip" + select BR2_LEGACY + select BR2_PACKAGE_ZIP + help + Info-Zip's Zip package has been renamed from infozip to zip, + to avoid ambiguities with Info-Zip's UnZip which has been added + in the unzip package. + ############################################################################### comment "Legacy options removed in 2015.11" diff --git a/package/Config.in b/package/Config.in index 988fe844b8..9e3494a6a6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -51,11 +51,11 @@ menu "Compressors and decompressors" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/gzip/Config.in" endif - source "package/infozip/Config.in" source "package/lz4/Config.in" source "package/lzip/Config.in" source "package/lzop/Config.in" source "package/xz/Config.in" + source "package/zip/Config.in" endmenu menu "Debugging, profiling and benchmark" diff --git a/package/infozip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch b/package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch similarity index 100% rename from package/infozip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch rename to package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch diff --git a/package/infozip/0002-configure-Don-t-use-host-CPP.patch b/package/zip/0002-configure-Don-t-use-host-CPP.patch similarity index 100% rename from package/infozip/0002-configure-Don-t-use-host-CPP.patch rename to package/zip/0002-configure-Don-t-use-host-CPP.patch diff --git a/package/infozip/0003-Makefile-Use-CFLAGS-from-command-line.patch b/package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch similarity index 100% rename from package/infozip/0003-Makefile-Use-CFLAGS-from-command-line.patch rename to package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch diff --git a/package/infozip/0004-configure-use-LDFLAGS-from-command-line.patch b/package/zip/0004-configure-use-LDFLAGS-from-command-line.patch similarity index 100% rename from package/infozip/0004-configure-use-LDFLAGS-from-command-line.patch rename to package/zip/0004-configure-use-LDFLAGS-from-command-line.patch diff --git a/package/infozip/0005-unix-configure-remove-GID-UID-size-check.patch b/package/zip/0005-unix-configure-remove-GID-UID-size-check.patch similarity index 100% rename from package/infozip/0005-unix-configure-remove-GID-UID-size-check.patch rename to package/zip/0005-unix-configure-remove-GID-UID-size-check.patch diff --git a/package/infozip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch b/package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch similarity index 100% rename from package/infozip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch rename to package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch diff --git a/package/infozip/Config.in b/package/zip/Config.in similarity index 88% rename from package/infozip/Config.in rename to package/zip/Config.in index cfd7533e60..4b6360a456 100644 --- a/package/infozip/Config.in +++ b/package/zip/Config.in @@ -1,5 +1,5 @@ -config BR2_PACKAGE_INFOZIP - bool "infozip" +config BR2_PACKAGE_ZIP + bool "zip" help Zip is a compression and file packaging/archive utility. Although highly compatible both with PKWARE's PKZIP and diff --git a/package/infozip/infozip.hash b/package/zip/zip.hash similarity index 100% rename from package/infozip/infozip.hash rename to package/zip/zip.hash diff --git a/package/infozip/infozip.mk b/package/zip/zip.mk similarity index 66% rename from package/infozip/infozip.mk rename to package/zip/zip.mk index e57f7e16d0..5338f88166 100644 --- a/package/infozip/infozip.mk +++ b/package/zip/zip.mk @@ -1,51 +1,51 @@ ################################################################################ # -# infozip +# zip # ################################################################################ -INFOZIP_VERSION = 30 -INFOZIP_SOURCE = zip$(INFOZIP_VERSION).tgz -INFOZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src -INFOZIP_LICENSE = Info-ZIP -INFOZIP_LICENSE_FILES = LICENSE +ZIP_VERSION = 30 +ZIP_SOURCE = zip$(ZIP_VERSION).tgz +ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src +ZIP_LICENSE = Info-ZIP +ZIP_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_BZIP2),y) -INFOZIP_DEPENDENCIES += bzip2 +ZIP_DEPENDENCIES += bzip2 endif # Infozip's default CFLAGS. -INFOZIP_CFLAGS = -I. -DUNIX +ZIP_CFLAGS = -I. -DUNIX # Disable the support of 16-bit UIDs/GIDs, the test in unix/configure was # removed since it can't work for cross-compilation. -INFOZIP_CFLAGS += -DUIDGID_NOT_16BIT +ZIP_CFLAGS += -DUIDGID_NOT_16BIT # infozip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when # necessary, redefining it on the command line causes some warnings. -INFOZIP_TARGET_CFLAGS = \ +ZIP_TARGET_CFLAGS = \ $(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) -define INFOZIP_BUILD_CMDS +define ZIP_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - CFLAGS="$(INFOZIP_TARGET_CFLAGS) $(INFOZIP_CFLAGS)" \ + CFLAGS="$(ZIP_TARGET_CFLAGS) $(ZIP_CFLAGS)" \ AS="$(TARGET_CC) -c" \ -f unix/Makefile generic endef -define INFOZIP_INSTALL_TARGET_CMDS +define ZIP_INSTALL_TARGET_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \ prefix=$(TARGET_DIR)/usr endef -define HOST_INFOZIP_BUILD_CMDS +define HOST_ZIP_BUILD_CMDS $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ - CFLAGS="$(HOST_CFLAGS) $(INFOZIP_CFLAGS)" \ + CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \ AS="$(HOSTCC) -c" \ -f unix/Makefile generic endef -define HOST_INFOZIP_INSTALL_CMDS +define HOST_ZIP_INSTALL_CMDS $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \ prefix=$(HOST_DIR)/usr endef From 6752beb5f5db3c2023a1722db659b271f86ec5d8 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 25 Nov 2015 14:25:27 +0000 Subject: [PATCH 107/132] libplist: use the official project url Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/libplist/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libplist/Config.in b/package/libplist/Config.in index c9d511b977..4b2b5298fa 100644 --- a/package/libplist/Config.in +++ b/package/libplist/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBPLIST libplist is a client for manipulating Apple Property List (.plist) files - http://cgit.sukimashita.com/libplist.git + http://www.libimobiledevice.org/ comment "libplist needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP From 25c33d2f97164bdafac68ecbf95e064931e40e40 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 25 Nov 2015 14:25:28 +0000 Subject: [PATCH 108/132] libplist: put depends before selects Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/libplist/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libplist/Config.in b/package/libplist/Config.in index 4b2b5298fa..5f96746ea9 100644 --- a/package/libplist/Config.in +++ b/package/libplist/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBPLIST bool "libplist" - select BR2_PACKAGE_LIBXML2 depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LIBXML2 help libplist is a client for manipulating Apple Property List (.plist) files From d4d337d736f091f26c3a9a5e3a525d70c26e02cc Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 25 Nov 2015 14:25:29 +0000 Subject: [PATCH 109/132] libplist: download from the official project website and use a tar.bz2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/libplist/libplist.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libplist/libplist.mk b/package/libplist/libplist.mk index b87c5ba3c4..7f60b5ee03 100644 --- a/package/libplist/libplist.mk +++ b/package/libplist/libplist.mk @@ -5,7 +5,8 @@ ################################################################################ LIBPLIST_VERSION = 1.12 -LIBPLIST_SITE = http://cgit.sukimashita.com/libplist.git/snapshot +LIBPLIST_SOURCE = libplist-$(LIBPLIST_VERSION).tar.bz2 +LIBPLIST_SITE = http://www.libimobiledevice.org/downloads LIBPLIST_DEPENDENCIES = libxml2 host-pkgconf LIBPLIST_INSTALL_STAGING = YES LIBPLIST_LICENSE = LGPLv2.1+ From 30ef60be787d2ed94af14b6f2daebf181054ddbc Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 25 Nov 2015 14:25:30 +0000 Subject: [PATCH 110/132] libplist: add a hash file Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/libplist/libplist.hash | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package/libplist/libplist.hash diff --git a/package/libplist/libplist.hash b/package/libplist/libplist.hash new file mode 100644 index 0000000000..06d1b16426 --- /dev/null +++ b/package/libplist/libplist.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0effdedcb3de128c4930d8c03a3854c74c426c16728b8ab5f0a5b6bdc0b644be libplist-1.12.tar.bz2 From bcf25bffbe9887c6749d41a40637895fbe74f965 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 25 Nov 2015 13:36:14 +0000 Subject: [PATCH 111/132] at: bump version to 3.1.16 - Bump version to 3.1.16 - Update the hash value - Remove upstreamed patches: 0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch 0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch - Tweak patches for the new version: 0004-Makefile.in-replace-IROOT-by-DESTDIR.patch 0005-Makefile.in-make-install-fix.patch Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- ...ove-manual-compiler-check-with-AC_TR.patch | 33 -------------- ...file.in-add-LDFLAGS-to-linking-stage.patch | 38 ---------------- ...Makefile.in-replace-IROOT-by-DESTDIR.patch | 43 ++++++++++++------- .../0005-Makefile.in-make-install-fix.patch | 38 ++++++++++------ package/at/at.hash | 6 +-- package/at/at.mk | 2 +- 6 files changed, 56 insertions(+), 104 deletions(-) delete mode 100644 package/at/0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch delete mode 100644 package/at/0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch diff --git a/package/at/0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch b/package/at/0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch deleted file mode 100644 index 9e69922945..0000000000 --- a/package/at/0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a182f18fa3b9fb3dd817b601b51c758f9a77f407 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Tue, 1 Dec 2009 17:08:14 +0100 -Subject: [PATCH 1/5] configure.ac: remove manual compiler check with AC_TRY_RUN - -AC_TRY_RUN breaks cross compilation, so remove it. autotools will take -care about a working (cross-) compiler. - -Signed-off-by: Marc Kleine-Budde ---- - configure.ac | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a8c2a14..997a37f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -38,12 +38,6 @@ case "$host" in - AC_MSG_RESULT(no) - ;; - esac --AC_MSG_CHECKING(Trying to compile a trivial ANSI C program) --AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) -- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.), -- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)) - - AC_MSG_CHECKING(__attribute__((noreturn))) - AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);], --- -1.6.5.3 - diff --git a/package/at/0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch b/package/at/0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch deleted file mode 100644 index e1ab3d3766..0000000000 --- a/package/at/0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8720a71757f3626bf3bbc3a7aa2185e6387e5689 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Tue, 1 Dec 2009 20:37:31 +0100 -Subject: [PATCH 3/5] Makefile.in: add LDFLAGS to linking stage - -The linking stage ignores the LDFLAGS, this breaks if the flex library -lives in a non standard location. - -This patch add LDFLAGS to both "at" and "atd" linking stage. - -Signed-off-by: Marc Kleine-Budde ---- - Makefile.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index dae6b7d..b766bbb 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -65,13 +65,13 @@ LIST = Filelist Filelist.asc - all: at atd atrun - - at: $(ATOBJECTS) -- $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) - rm -f $(CLONES) - $(LN_S) -f at atq - $(LN_S) -f at atrm - - atd: $(RUNOBJECTS) -- $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) - - y.tab.c y.tab.h: parsetime.y - $(YACC) -d parsetime.y --- -1.6.5.3 - diff --git a/package/at/0004-Makefile.in-replace-IROOT-by-DESTDIR.patch b/package/at/0004-Makefile.in-replace-IROOT-by-DESTDIR.patch index 0d1d5f6e3e..856b6c8d08 100644 --- a/package/at/0004-Makefile.in-replace-IROOT-by-DESTDIR.patch +++ b/package/at/0004-Makefile.in-replace-IROOT-by-DESTDIR.patch @@ -6,27 +6,30 @@ Subject: [PATCH 5/5] Makefile.in: replace IROOT by DESTDIR This patch replaces IROOT by DESTDIR, which is the autotools standard variable. For backwards compatibilty IROOT overwrites the DESTDIR. -Signed-off-by: Marc Kleine-Budde ---- - Makefile.in | 64 +++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 34 insertions(+), 30 deletions(-) +[Vincent: tweak the patch for the new version] -Index: at-3.1.13/Makefile.in -=================================================================== ---- at-3.1.13.orig/Makefile.in -+++ at-3.1.13/Makefile.in -@@ -16,6 +16,10 @@ docdir = $(prefix)/doc - atdocdir = $(docdir)/at +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Vicente Olivert Riera +--- + Makefile.in | 68 ++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 36 insertions(+), 32 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 06544f9..1f699d9 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -17,6 +17,10 @@ atdocdir = $(docdir)/at etcdir = @ETCDIR@ + systemdsystemunitdir = @systemdsystemunitdir@ +ifdef IROOT -+DESTDIR = $(IROOT) ++DESTDIR = $(DESTDIR) +endif + DAEMON_USERNAME = @DAEMON_USERNAME@ DAEMON_GROUPNAME= @DAEMON_GROUPNAME@ LOADAVG_MX = @LOADAVG_MX@ -@@ -86,38 +90,38 @@ atrun: atrun.in +@@ -91,41 +95,41 @@ atrun: atrun.in $(CC) -c $(CFLAGS) $(DEFS) $*.c install: all @@ -63,15 +66,15 @@ Index: at-3.1.13/Makefile.in + touch $(DESTDIR)$(LFILE) + chmod 600 $(DESTDIR)$(LFILE) + chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE) -+ test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR$ -+ $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(DESTDIR)$(bindir) ++ test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/ ++ $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(DESTDIR)$(bindir) + $(LN_S) -f at $(DESTDIR)$(bindir)/atq + $(LN_S) -f at $(DESTDIR)$(bindir)/atrm + $(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir) + $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir) + $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir) + $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir) -+ $(INSTALL) -g root -o root -m 755 -s atd $(DESTDIR)$(sbindir) ++ $(INSTALL) -g root -o root -m 755 atd $(DESTDIR)$(sbindir) + $(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir) + $(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/ + cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 @@ -92,6 +95,14 @@ Index: at-3.1.13/Makefile.in + rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \ + $(DESTDIR)$(mandir)/cat1/atq.1* + rm -f $(DESTDIR)$(mandir)/cat1/atd.8* + if test x"$(systemdsystemunitdir)" != xno; then \ +- $(INSTALL) -o root -g root -m 755 -d $(IROOT)$(systemdsystemunitdir); \ +- $(INSTALL) -o root -g root -m 644 atd.service $(IROOT)$(systemdsystemunitdir); \ ++ $(INSTALL) -o root -g root -m 755 -d $(DESTDIR)$(systemdsystemunitdir); \ ++ $(INSTALL) -o root -g root -m 644 atd.service $(DESTDIR)$(systemdsystemunitdir); \ + fi dist: checkin $(DIST) $(LIST) Filelist.asc - (cd ..; tar cf - `for a in $(DIST) $(LIST); do echo at-$(VERSION)/$$a; done` |\ +-- +2.4.10 + diff --git a/package/at/0005-Makefile.in-make-install-fix.patch b/package/at/0005-Makefile.in-make-install-fix.patch index ad843449a2..831ea1a3a9 100644 --- a/package/at/0005-Makefile.in-make-install-fix.patch +++ b/package/at/0005-Makefile.in-make-install-fix.patch @@ -3,16 +3,19 @@ Buildroot will ensure all files are owned by root and stripped anyway (if needed) before the rootfs is created. -Signed-off-by: Peter Korsgaard ---- - Makefile.in | 39 +++++++++++++++++++-------------------- - 1 file changed, 19 insertions(+), 20 deletions(-) +[Vincent: tweak the patch for the new version] -Index: at-3.1.13/Makefile.in -=================================================================== ---- at-3.1.13.orig/Makefile.in -+++ at-3.1.13/Makefile.in -@@ -90,35 +90,34 @@ atrun: atrun.in +Signed-off-by: Peter Korsgaard +Signed-off-by: Vicente Olivert Riera +--- + Makefile.in | 43 +++++++++++++++++++++---------------------- + 1 file changed, 21 insertions(+), 22 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 1f699d9..f313f9b 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -95,41 +95,40 @@ atrun: atrun.in $(CC) -c $(CFLAGS) $(DEFS) $*.c install: all @@ -32,8 +35,8 @@ Index: at-3.1.13/Makefile.in touch $(DESTDIR)$(LFILE) chmod 600 $(DESTDIR)$(LFILE) - chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE) -- test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR$ -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(DESTDIR)$(bindir) +- test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/ +- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(DESTDIR)$(bindir) + test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -m 640 at.deny $(DESTDIR)$(etcdir)/ + $(INSTALL) -m 6755 at $(DESTDIR)$(bindir) $(LN_S) -f at $(DESTDIR)$(bindir)/atq @@ -42,7 +45,7 @@ Index: at-3.1.13/Makefile.in - $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir) - $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir) - $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir) -- $(INSTALL) -g root -o root -m 755 -s atd $(DESTDIR)$(sbindir) +- $(INSTALL) -g root -o root -m 755 atd $(DESTDIR)$(sbindir) - $(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir) - $(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/ + $(INSTALL) -m 755 batch $(DESTDIR)$(bindir) @@ -67,3 +70,14 @@ Index: at-3.1.13/Makefile.in rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \ $(DESTDIR)$(mandir)/cat1/atq.1* rm -f $(DESTDIR)$(mandir)/cat1/atd.8* + if test x"$(systemdsystemunitdir)" != xno; then \ +- $(INSTALL) -o root -g root -m 755 -d $(DESTDIR)$(systemdsystemunitdir); \ +- $(INSTALL) -o root -g root -m 644 atd.service $(DESTDIR)$(systemdsystemunitdir); \ ++ $(INSTALL) -m 755 -d $(DESTDIR)$(systemdsystemunitdir); \ ++ $(INSTALL) -m 644 atd.service $(DESTDIR)$(systemdsystemunitdir); \ + fi + + dist: checkin $(DIST) $(LIST) Filelist.asc +-- +2.4.10 + diff --git a/package/at/at.hash b/package/at/at.hash index 481c93716f..22c732cc7e 100644 --- a/package/at/at.hash +++ b/package/at/at.hash @@ -1,4 +1,2 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/at/at_3.1.13-2%2Bdeb7u1.dsc -sha1 9873e0c38403ef58364912d0b505fd20798fd400 at_3.1.13.orig.tar.gz -sha256 3a8b90868d615d21a92f4986ea9a823886329af8fae8dd7ab4eed9b273bca072 at_3.1.13.orig.tar.gz -md5 1da61af6c29e323abaaf13ee1a8dad79 at_3.1.13.orig.tar.gz +# From: http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/at/at_3.1.16-1.dsc +sha256 cb9af59c6a54edce9536ba629841055409d1f89d8ae26494727a97141fb4d5c1 at_3.1.16.orig.tar.gz diff --git a/package/at/at.mk b/package/at/at.mk index 1504e32a62..8865360427 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -4,7 +4,7 @@ # ################################################################################ -AT_VERSION = 3.1.13 +AT_VERSION = 3.1.16 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz AT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/at # missing deps for parsetime.l From 3a7fce0c953c6f90e2da29e349a65a1335610e42 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 25 Nov 2015 13:53:30 +0000 Subject: [PATCH 112/132] at: rename patches so they are in a consecutive order Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- ...01-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch} | 0 ...TDIR.patch => 0002-Makefile.in-replace-IROOT-by-DESTDIR.patch} | 0 ...-install-fix.patch => 0003-Makefile.in-make-install-fix.patch} | 0 .../{0006-getloadavg.c-fix.patch => 0004-getloadavg.c-fix.patch} | 0 ...ude-config-h.patch => 0005-parsetime.l-include-config-h.patch} | 0 ...sumption.patch => 0006-remove-glibc-__isleap-assumption.patch} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename package/at/{0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch => 0001-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch} (100%) rename package/at/{0004-Makefile.in-replace-IROOT-by-DESTDIR.patch => 0002-Makefile.in-replace-IROOT-by-DESTDIR.patch} (100%) rename package/at/{0005-Makefile.in-make-install-fix.patch => 0003-Makefile.in-make-install-fix.patch} (100%) rename package/at/{0006-getloadavg.c-fix.patch => 0004-getloadavg.c-fix.patch} (100%) rename package/at/{0007-parsetime.l-include-config-h.patch => 0005-parsetime.l-include-config-h.patch} (100%) rename package/at/{0008-remove-glibc-__isleap-assumption.patch => 0006-remove-glibc-__isleap-assumption.patch} (100%) diff --git a/package/at/0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch b/package/at/0001-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch similarity index 100% rename from package/at/0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch rename to package/at/0001-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch diff --git a/package/at/0004-Makefile.in-replace-IROOT-by-DESTDIR.patch b/package/at/0002-Makefile.in-replace-IROOT-by-DESTDIR.patch similarity index 100% rename from package/at/0004-Makefile.in-replace-IROOT-by-DESTDIR.patch rename to package/at/0002-Makefile.in-replace-IROOT-by-DESTDIR.patch diff --git a/package/at/0005-Makefile.in-make-install-fix.patch b/package/at/0003-Makefile.in-make-install-fix.patch similarity index 100% rename from package/at/0005-Makefile.in-make-install-fix.patch rename to package/at/0003-Makefile.in-make-install-fix.patch diff --git a/package/at/0006-getloadavg.c-fix.patch b/package/at/0004-getloadavg.c-fix.patch similarity index 100% rename from package/at/0006-getloadavg.c-fix.patch rename to package/at/0004-getloadavg.c-fix.patch diff --git a/package/at/0007-parsetime.l-include-config-h.patch b/package/at/0005-parsetime.l-include-config-h.patch similarity index 100% rename from package/at/0007-parsetime.l-include-config-h.patch rename to package/at/0005-parsetime.l-include-config-h.patch diff --git a/package/at/0008-remove-glibc-__isleap-assumption.patch b/package/at/0006-remove-glibc-__isleap-assumption.patch similarity index 100% rename from package/at/0008-remove-glibc-__isleap-assumption.patch rename to package/at/0006-remove-glibc-__isleap-assumption.patch From b0e6d657d48487081db2738b93fa8b33ec1e2c7f Mon Sep 17 00:00:00 2001 From: Joris Lijssens Date: Fri, 20 Nov 2015 16:29:27 +0100 Subject: [PATCH 113/132] libnet: disable for musl toolchains Signed-off-by: Joris Lijssens Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libnet/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libnet/Config.in b/package/libnet/Config.in index 7186972b7e..8a881286e7 100644 --- a/package/libnet/Config.in +++ b/package/libnet/Config.in @@ -1,7 +1,12 @@ config BR2_PACKAGE_LIBNET bool "libnet" + # Build with musl fails due to header issues + depends on !BR2_TOOLCHAIN_USES_MUSL help libnet provides a portable framework for low-level network packet construction. http://sourceforge.net/projects/libnet-dev + +comment "libnet needs a (e)glibc or uClibc toolchain" + depends on BR2_TOOLCHAIN_USES_MUSL From 546a661ecc64d4c93bffe47ea93d9ca1c4422fdf Mon Sep 17 00:00:00 2001 From: Joris Lijssens Date: Fri, 20 Nov 2015 16:29:28 +0100 Subject: [PATCH 114/132] libnet: PF_PACKET is always available on Linux [Thomas: remove mistakenly added empty line.] Signed-off-by: Joris Lijssens Signed-off-by: Thomas Petazzoni --- package/libnet/libnet.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libnet/libnet.mk b/package/libnet/libnet.mk index 3b62a793b3..d13c4533b2 100644 --- a/package/libnet/libnet.mk +++ b/package/libnet/libnet.mk @@ -7,6 +7,8 @@ LIBNET_VERSION = 1.1.6 LIBNET_SITE = http://sourceforge.net/projects/libnet-dev/files LIBNET_INSTALL_STAGING = YES +# PF_PACKET is always available on Linux +LIBNET_CONF_OPTS = libnet_cv_have_packet_socket=yes LIBNET_LICENSE = BSD-2c, BSD-3c LIBNET_LICENSE_FILES = doc/COPYING From 10478514a51427e855f83eeb24a0502b1380150c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 20 Nov 2015 10:34:15 -0300 Subject: [PATCH 115/132] squashfs: always enable xattr support In 785fef10 xattr support was disabled, probably because the old version did require the xattr package to be present to support it. In a409d76e xattr support was made optional via (lib)attr, however the squashfs package does in fact include all of the required bits to support xattr without the need for the attr package. So enable xattr support by default for both the host and target variants. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/squashfs/squashfs.mk | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index 3204d05458..cdeb9c8f72 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -9,13 +9,7 @@ SQUASHFS_SOURCE = squashfs$(SQUASHFS_VERSION).tar.gz SQUASHFS_SITE = http://downloads.sourceforge.net/project/squashfs/squashfs/squashfs$(SQUASHFS_VERSION) SQUASHFS_LICENSE = GPLv2+ SQUASHFS_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_ATTR),y) -SQUASHFS_DEPENDENCIES += attr -SQUASHFS_MAKE_ARGS += XATTR_SUPPORT=1 -else -SQUASHFS_MAKE_ARGS += XATTR_SUPPORT=0 -endif +SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y) SQUASHFS_DEPENDENCIES += lz4 @@ -54,9 +48,8 @@ endif HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz -# no libattr/xz in BR HOST_SQUASHFS_MAKE_ARGS = \ - XATTR_SUPPORT=0 \ + XATTR_SUPPORT=1 \ XZ_SUPPORT=1 \ GZIP_SUPPORT=1 \ LZ4_SUPPORT=1 \ From 9ed8750b4313bf26798c063c83a071995c90bb40 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Sat, 21 Nov 2015 00:14:29 -0200 Subject: [PATCH 116/132] spi-tools: new package This package contains some simple command line tools to help using Linux spidev devices. https://github.com/cpb-/spi-tools The included version is based in a sha1 and not a tagged version as the current master branch contains autotools support for build but there is no tagged version with autotools support yet. The only other quirk with the recipe is related to the VERSION define which is normally obtained in build time via git for this package, but that would fail within Buildroot as the package build is normally not performed inside a git repository. To work around that, I have added a hook which will substitute change the VERSION to match that of the Buildroot package. I have tested this package in an ARM target with a custom SPI device. Signed-off-by: Erico Nunes Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/spi-tools/Config.in | 7 +++++++ package/spi-tools/spi-tools.hash | 2 ++ package/spi-tools/spi-tools.mk | 24 ++++++++++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 package/spi-tools/Config.in create mode 100644 package/spi-tools/spi-tools.hash create mode 100644 package/spi-tools/spi-tools.mk diff --git a/package/Config.in b/package/Config.in index 9e3494a6a6..658dc03f76 100644 --- a/package/Config.in +++ b/package/Config.in @@ -417,6 +417,7 @@ endif source "package/smartmontools/Config.in" source "package/smstools3/Config.in" source "package/snowball-hdmiservice/Config.in" + source "package/spi-tools/Config.in" source "package/sredird/Config.in" source "package/statserial/Config.in" source "package/stm32flash/Config.in" diff --git a/package/spi-tools/Config.in b/package/spi-tools/Config.in new file mode 100644 index 0000000000..8d2634444a --- /dev/null +++ b/package/spi-tools/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_SPI_TOOLS + bool "spi-tools" + help + This package contains some simple command line tools to help + using Linux spidev devices. + + https://github.com/cpb-/spi-tools diff --git a/package/spi-tools/spi-tools.hash b/package/spi-tools/spi-tools.hash new file mode 100644 index 0000000000..61ccd5ebdd --- /dev/null +++ b/package/spi-tools/spi-tools.hash @@ -0,0 +1,2 @@ +# locally computed hash +sha256 52ab1f1de29afbac95983f5af58adcb1807e1f3479a897e9331e020b5cfa296f spi-tools-cc6a41fdcec60610703ba6db488c621c64952898.tar.gz diff --git a/package/spi-tools/spi-tools.mk b/package/spi-tools/spi-tools.mk new file mode 100644 index 0000000000..f3df435346 --- /dev/null +++ b/package/spi-tools/spi-tools.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# spi-tools +# +################################################################################ + +# git commit sha1 is used as there is no release tag with autotools support yet +SPI_TOOLS_VERSION = cc6a41fdcec60610703ba6db488c621c64952898 +SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION)) +# autoreconf must be run as specified in package documentation +SPI_TOOLS_AUTORECONF = YES +SPI_TOOLS_LICENSE = GPLv2 +SPI_TOOLS_LICENSE_FILES = LICENSE + +# Package attempts to use git to obtain version, that fails within Buildroot. +# To avoid it, set the GIT_VERSION variable to the Buildroot package version. +define SPI_TOOLS_SET_VERSION + $(SED) "s/^\(GIT_VERSION:=\).*/\1$(SPI_TOOLS_VERSION)/" \ + $(@D)/src/Makefile.am +endef + +SPI_TOOLS_POST_PATCH_HOOKS = SPI_TOOLS_SET_VERSION + +$(eval $(autotools-package)) From f8b8251a921a7fa4e05b545e503cfc4e736d1d0d Mon Sep 17 00:00:00 2001 From: Vivien Didelot Date: Fri, 6 Nov 2015 23:39:24 -0500 Subject: [PATCH 117/132] support/download: fetch all refs on full git clone When specifying BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION, a user may want to specify the SHA of a reference different than a branch or tag. For instance, Gerrit stores the patchsets under refs/changes/xx/xxx, and Github stores the pull requests under refs/pull/xxx/head. When cloning a repository with --bare, you don't fetch these references. This patch uses --mirror for a full clone, in order to give the user access to all references of the Git repository. Signed-off-by: Vivien Didelot Reviewed-by: "Maxime Hadjinlian" Signed-off-by: Thomas Petazzoni --- support/download/git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/git b/support/download/git index 0e6103b648..357a55806e 100755 --- a/support/download/git +++ b/support/download/git @@ -43,7 +43,7 @@ if [ -n "$(${GIT} ls-remote "${repo}" "${cset}" 2>&1)" ]; then fi if [ ${git_done} -eq 0 ]; then printf "Doing full clone\n" - ${GIT} clone ${verbose} --bare "${repo}" "${basename}" + ${GIT} clone ${verbose} --mirror "${repo}" "${basename}" fi GIT_DIR="${basename}" \ From 376fda8f99cd0511c03be4b937e9684a565745da Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 4 Nov 2015 22:42:39 +0100 Subject: [PATCH 118/132] core/printvars: allow dumping a set of variables Dumping our 176164 variables can take quite some time (~12s here). What takes the most time is sorting the variables (~9s), followed by the parsing of our Makefiles (~3s), with the actual printing in the noise. However, sometimes only one or a few variables are needed. For example, one may want to retrieve the Linux build dir from a post-build hook (to get the Linux' actual .config after our fixups and check for various features). Add the possibility to only dump the variables listed in $(VAR) which must be passed as a make argument, like so: $ make -s printvars VARS="LINUX_DIR TOPDIR O" LINUX_DIR=/home/ymorin/dev/buildroot/O/build/linux-4.3 ($(BUILD_DIR)/$(LINUX_BASE_NAME)) O=/home/ymorin/dev/buildroot/O/. (/home/ymorin/dev/buildroot/O/.) TOPDIR=/home/ymorin/dev/buildroot/buildroot (/home/ymorin/dev/buildroot/buildroot) It is also possible to use make-appterns, like: $ make -s printvars VARS="BUSYBOX_%" This is much faster (the time is just about the time it takes to parse our Makefiles, 3s here) and easier to parse. [Thomas: improve comment above the printvars target.] Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9950a26cd0..641aeffa5f 100644 --- a/Makefile +++ b/Makefile @@ -823,10 +823,13 @@ ifeq ($(NEED_WRAPPER),y) $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O) endif -# printvars prints all the variables currently defined in our Makefiles +# printvars prints all the variables currently defined in our +# Makefiles. Alternatively, if a non-empty VARS variable is passed, +# only the variables matching the make pattern passed in VARS are +# displayed. printvars: @$(foreach V, \ - $(sort $(.VARIABLES)), \ + $(sort $(if $(VARS),$(filter $(VARS),$(.VARIABLES)),$(.VARIABLES))), \ $(if $(filter-out environment% default automatic, \ $(origin $V)), \ $(info $V=$($V) ($(value $V))))) From 66a1ecb17afa904fee69d34aff03cb922cb9d27e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 30 Nov 2015 08:08:34 -0300 Subject: [PATCH 119/132] harfbuzz: bump to version 1.1.2 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 e15cc17bc5..0b2bdcb84a 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.1.tar.bz2.sha256 -sha256 0c366a77276fa69d40006cf8a2f2dbcd82f3fb406f3960c3c3a0d34dd3a0f06c harfbuzz-1.1.1.tar.bz2 +# From http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.1.2.tar.bz2.sha256 +sha256 4a2c5790bd3db7c3ca8c02e4858f2fd592df7932c1d2fa9f6b99acbce0f8461f harfbuzz-1.1.2.tar.bz2 diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 8251e1fe6c..be8a899983 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 1.1.1 +HARFBUZZ_VERSION = 1.1.2 HARFBUZZ_SITE = http://www.freedesktop.org/software/harfbuzz/release HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 76a861290416532cb1c5b5191d2b064091bc1c8c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 30 Nov 2015 08:08:35 -0300 Subject: [PATCH 120/132] freetype: bump to version 2.6.2 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 d857a387ae..dc238f2003 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.1/ -md5 35cb8f4d9e5906847901bb39324c2f80 freetype-2.6.1.tar.bz2 -sha1 393447fbf64c107b20a1ccc9e9a9a52f39786ae0 freetype-2.6.1.tar.bz2 +# 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 diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 1fb5b8fab6..fa11b0ca3d 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.6.1 +FREETYPE_VERSION = 2.6.2 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION) FREETYPE_INSTALL_STAGING = YES From 2940576b0b5ea4d69e8043da6a3ab46bd2f2bed8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 30 Nov 2015 08:34:06 -0300 Subject: [PATCH 121/132] squid: bump to version 3.5.12 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/squid/squid.hash | 6 +++--- package/squid/squid.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/squid/squid.hash b/package/squid/squid.hash index 8d8186255d..c806dc9cb8 100644 --- a/package/squid/squid.hash +++ b/package/squid/squid.hash @@ -1,3 +1,3 @@ -# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.11.tar.xz.asc -md5 eb5e1cf3cf012e5b85d6f7ca78b7afab squid-3.5.11.tar.xz -sha1 623e0d4a41ddc70e0f59a3f38c091e0dc946172c squid-3.5.11.tar.xz +# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.12.tar.xz.asc +md5 50016bf6e2d3a3a186a6c7236d251f63 squid-3.5.12.tar.xz +sha1 59b0dcb2c9c04f1a0586f7a1f346197ddb6d5be5 squid-3.5.12.tar.xz diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 747148838d..dcaab0af7d 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -5,7 +5,7 @@ ################################################################################ SQUID_VERSION_MAJOR = 3.5 -SQUID_VERSION = $(SQUID_VERSION_MAJOR).11 +SQUID_VERSION = $(SQUID_VERSION_MAJOR).12 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR) SQUID_LICENSE = GPLv2+ From b768ed4d06524204dbed46df68a24887fab48ea9 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 30 Nov 2015 13:43:38 +0000 Subject: [PATCH 122/132] imagemagick: bump version to 6.9.2-7 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/imagemagick/imagemagick.hash | 2 +- package/imagemagick/imagemagick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index 61f73fb8fa..39317626df 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,2 +1,2 @@ # From http://www.imagemagick.org/download/releases/digest.rdf -sha256 19fb341725a13c01458cfce23d0a260fd032432a5daeebdd4f06c92d716ded40 ImageMagick-6.9.2-5.tar.xz +sha256 eef80bf259823523dafbcdae15e236b443ecf6d4ae415106d7a861d1fa8d9d13 ImageMagick-6.9.2-7.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index c1498292c4..9238952e2f 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 6.9.2-5 +IMAGEMAGICK_VERSION = 6.9.2-7 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From 15e062edde24e6b92b741acbb3364c99da754b25 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 30 Nov 2015 16:20:41 +0000 Subject: [PATCH 123/132] lvm2: bump version to 2.02.136 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- 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 a51b9a49e6..99c576e274 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 698fadf1a12f6bfc6f8bd9d6499d2cf181e2cf7b9a5105b58cb55168f6104c949aa5d5da0585194d54614128a14abc7b939d43b32f7175057ad14cb1c62796a0 LVM2.2.02.135.tgz +sha512 ebda683e7dbeb2c4860a583d47e60756d18127e37a373ab2958af8e54b9bee0d2e3370b7803d88fa4b08564345c88af55bfbac317081160118ce4b3733b69f9d LVM2.2.02.136.tgz diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 9caa0517b9..71e69d6b47 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.02.135 +LVM2_VERSION = 2.02.136 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_INSTALL_STAGING = YES From 0209b529b09868352cbfd456bbfbf47c0d8aa9d6 Mon Sep 17 00:00:00 2001 From: Ryan Barnett Date: Sun, 5 Apr 2015 17:10:11 -0500 Subject: [PATCH 124/132] miraclecast: new package [Thomas: - add hash file - fix license information: use comma as a separator in _LICENSE, and htable is under LGPLv2.1+ and not GPLv2.1+ (which doesn't exist)] Signed-off-by: Ryan Barnett CC: Baruch Siach CC: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/miraclecast/Config.in | 23 +++++++++++++++++++++++ package/miraclecast/miraclecast.hash | 2 ++ package/miraclecast/miraclecast.mk | 23 +++++++++++++++++++++++ 4 files changed, 49 insertions(+) create mode 100644 package/miraclecast/Config.in create mode 100644 package/miraclecast/miraclecast.hash create mode 100644 package/miraclecast/miraclecast.mk diff --git a/package/Config.in b/package/Config.in index 658dc03f76..3343a535e8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -21,6 +21,7 @@ menu "Audio and video applications" source "package/kodi/Config.in" source "package/lame/Config.in" source "package/madplay/Config.in" + source "package/miraclecast/Config.in" source "package/mjpegtools/Config.in" source "package/modplugtools/Config.in" source "package/mpd/Config.in" diff --git a/package/miraclecast/Config.in b/package/miraclecast/Config.in new file mode 100644 index 0000000000..4c6a8aaa07 --- /dev/null +++ b/package/miraclecast/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_MIRACLECAST + bool "miraclecast" + depends on BR2_PACKAGE_SYSTEMD + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_USE_WCHAR # glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_READLINE + select BR2_PACKAGE_SYSTEMD_KDBUS + help + The MiracleCast project provides software to connect external + monitors to your system via Wifi. It is compatible to the + Wifi-Display specification also known as Miracast. MiracleCast + implements the Display-Source as well as Display-Sink side. + + https://github.com/albfan/miraclecast + +comment "miraclecast needs systemd and a glibc toolchain w/ threads and wchar" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_SYSTEMD diff --git a/package/miraclecast/miraclecast.hash b/package/miraclecast/miraclecast.hash new file mode 100644 index 0000000000..2a92cbf045 --- /dev/null +++ b/package/miraclecast/miraclecast.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 deef87155ed07bcf737260c29599e886bd248b573e72ba167369df93acb1fa61 miraclecast-8b61f733da124ccbfd1b85e188581fad1c41c1e1.tar.gz diff --git a/package/miraclecast/miraclecast.mk b/package/miraclecast/miraclecast.mk new file mode 100644 index 0000000000..598dbd5e4e --- /dev/null +++ b/package/miraclecast/miraclecast.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# miraclecast +# +################################################################################ + +MIRACLECAST_VERSION = 8b61f733da124ccbfd1b85e188581fad1c41c1e1 +MIRACLECAST_SITE = $(call github,albfan,miraclecast,$(MIRACLECAST_VERSION)) +MIRACLECAST_LICENSE = LGPLv2.1+, GPLv2 (gdhcp) +MIRACLECAST_LICENSE_FILES = COPYING LICENSE_gdhcp LICENSE_htable LICENSE_lgpl +MIRACLECAST_DEPENDENCIES = host-pkgconf systemd gstreamer1 \ + readline libglib2 +# Straight out the repository, no ./configure +MIRACLECAST_AUTORECONF = YES + +define MIRACLECAST_INSTALL_DBUS_POLICY + $(INSTALL) -m 0644 -D \ + $(@D)/res/org.freedesktop.miracle.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/org.freedesktop.miracle.conf +endef +MIRACLECAST_POST_INSTALL_TARGET_HOOKS += MIRACLECAST_INSTALL_DBUS_POLICY + +$(eval $(autotools-package)) From b8fc2884d917973380721d48975d13b5fa46e7fc Mon Sep 17 00:00:00 2001 From: Doug Kehn Date: Sun, 24 May 2015 14:12:32 -0500 Subject: [PATCH 125/132] package/nss-pam-ldapd: new package Name Service Switch (NSS) module that allows your LDAP server to provide user account, group, host name, alias, netgroup, and basically any other information that you would normally get from /etc flat files or NIS. It also provides a Pluggable Authentication Module (PAM) to do authentication to an LDAP server. [Thomas: - bump to version 0.9.6 - use --disable- rather than --enable-=no. - fix license information: there is no LICENSE file, it is named COPYING.] Signed-off-by: Doug Kehn Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/nss-pam-ldapd/Config.in | 25 +++++++++++++ package/nss-pam-ldapd/S45nslcd | 25 +++++++++++++ package/nss-pam-ldapd/nslcd.service | 11 ++++++ package/nss-pam-ldapd/nss-pam-ldapd.hash | 4 +++ package/nss-pam-ldapd/nss-pam-ldapd.mk | 46 ++++++++++++++++++++++++ 6 files changed, 112 insertions(+) create mode 100644 package/nss-pam-ldapd/Config.in create mode 100644 package/nss-pam-ldapd/S45nslcd create mode 100644 package/nss-pam-ldapd/nslcd.service create mode 100644 package/nss-pam-ldapd/nss-pam-ldapd.hash create mode 100644 package/nss-pam-ldapd/nss-pam-ldapd.mk diff --git a/package/Config.in b/package/Config.in index 3343a535e8..2bdad01a60 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1057,6 +1057,7 @@ menu "Networking" source "package/libwebsockets/Config.in" source "package/neon/Config.in" source "package/nss-mdns/Config.in" + source "package/nss-pam-ldapd/Config.in" source "package/omniorb/Config.in" source "package/openldap/Config.in" source "package/openpgm/Config.in" diff --git a/package/nss-pam-ldapd/Config.in b/package/nss-pam-ldapd/Config.in new file mode 100644 index 0000000000..da6d331b8a --- /dev/null +++ b/package/nss-pam-ldapd/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_NSS_PAM_LDAPD + bool "nss-pam-ldapd" + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_OPENLDAP + help + Name Service Switch (NSS) module that allows your LDAP + server to provide user account, group, host name, alias, + netgroup, and basically any other information that you would + normally get from /etc flat files or NIS. It also provides a + Pluggable Authentication Module (PAM) to do authentication + to an LDAP server. + + http://arthurdejong.org/nss-pam-ldapd/ + +if BR2_PACKAGE_NSS_PAM_LDAPD + +config BR2_PACKAGE_NSS_PAM_LDAPD_UTILITIES + bool "nss-pam-ldapd utilities" + help + Build/Install command-line utilities. + +endif + +comment "nss-pam-ldapd needs an (e)glibc toolchain" + depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/nss-pam-ldapd/S45nslcd b/package/nss-pam-ldapd/S45nslcd new file mode 100644 index 0000000000..cd3e4d0f20 --- /dev/null +++ b/package/nss-pam-ldapd/S45nslcd @@ -0,0 +1,25 @@ +#!/bin/sh + +NAME="nslcd" +DAEMON="/usr/sbin/${NAME}" + +case "$1" in +start) + echo -n "Starting ${NAME}: " + start-stop-daemon -S -x ${DAEMON} + [ $? -eq 0 ] && echo "OK" || echo "FAIL" + ;; +stop) + echo -n "Stopping ${NAME}: " + start-stop-daemon -K -x ${DAEMON} + [ $? -eq 0 ] && echo "OK" || echo "FAIL" + ;; +restart|reload) + $0 stop + $0 start + ;; +*) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac + diff --git a/package/nss-pam-ldapd/nslcd.service b/package/nss-pam-ldapd/nslcd.service new file mode 100644 index 0000000000..6c0d71b241 --- /dev/null +++ b/package/nss-pam-ldapd/nslcd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Naming services LDAP client daemon. +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/nslcd/nslcd.pid +ExecStart=/usr/sbin/nslcd + +[Install] +WantedBy=multi-user.target diff --git a/package/nss-pam-ldapd/nss-pam-ldapd.hash b/package/nss-pam-ldapd/nss-pam-ldapd.hash new file mode 100644 index 0000000000..b931e6fc12 --- /dev/null +++ b/package/nss-pam-ldapd/nss-pam-ldapd.hash @@ -0,0 +1,4 @@ +# From http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.6.tar.gz.md5 +md5 fa5ec49cb54428d6c73e244a11021695 nss-pam-ldapd-0.9.6.tar.gz +# Locally computed: +sha256 101d5a7fa10549cc77be48d07f2b8141f59182f10f2cc0fea93efd13c3a5a6f2 nss-pam-ldapd-0.9.5.tar.gz diff --git a/package/nss-pam-ldapd/nss-pam-ldapd.mk b/package/nss-pam-ldapd/nss-pam-ldapd.mk new file mode 100644 index 0000000000..ba250829bb --- /dev/null +++ b/package/nss-pam-ldapd/nss-pam-ldapd.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# nss-pam-ldapd +# +################################################################################ + +NSS_PAM_LDAPD_VERSION = 0.9.6 +NSS_PAM_LDAPD_SITE = http://arthurdejong.org/nss-pam-ldapd +NSS_PAM_LDAPD_LICENSE = LGPLv2.1+ +NSS_PAM_LDAPD_LICENSE_FILES = COPYING +NSS_PAM_LDAPD_INSTALL_STAGING = YES + +NSS_PAM_LDAPD_CONF_OPTS = --disable-sasl +NSS_PAM_LDAPD_DEPENDENCIES = openldap + +ifeq ($(BR2_PACKAGE_NSS_PAM_LDAPD_UTILITIES),y) +NSS_PAM_LDAPD_CONF_OPTS += --enable-utils +else +NSS_PAM_LDAPD_CONF_OPTS += --disable-utils +endif + +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +NSS_PAM_LDAPD_CONF_OPTS += --enable-pam +NSS_PAM_LDAPD_DEPENDENCIES += linux-pam +else +NSS_PAM_LDAPD_CONF_OPTS += --disable-pam +endif + +define NSS_PAM_LDAPD_INSTALL_INIT_SYSTEMD + $(INSTALL) -m 755 -D package/nss-pam-ldapd/nslcd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/nslcd.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -fs ../../../../usr/lib/systemd/system/nslcd.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nslcd.service +endef + +define NSS_PAM_LDAPD_INSTALL_INIT_SYSV + $(INSTALL) -m 755 -D package/nss-pam-ldapd/S45nslcd \ + $(TARGET_DIR)/etc/init.d/S45nslcd +endef + +define NSS_PAM_LDAPD_USERS + nslcd -1 nslcd -1 * - - - nslcd user +endef + +$(eval $(autotools-package)) From cd36c24093966c7ecff227357dd345a159c156ab Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 1 Dec 2015 12:19:02 -0300 Subject: [PATCH 126/132] samba4: bump to version 4.3.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- 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 48860a75ea..2959e5ba1f 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 9908a80d95b9e2583906ed4347a8c80b769539a2788158992fb48ea9fb4d2c82 samba-4.3.1.tar.gz +sha256 61989195caadf0f6fb51ce6bed5e203e6146facc2c276a26ad41901ad9129a75 samba-4.3.2.tar.gz diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 1d02e86c7b..388a40cf1b 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.3.1 +SAMBA4_VERSION = 4.3.2 SAMBA4_SITE = http://ftp.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 34bb11e25659931765956c3978d778705a3fdda9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 1 Dec 2015 10:49:19 -0300 Subject: [PATCH 127/132] dhcpcd: bump to version 6.9.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/dhcpcd/dhcpcd.hash | 2 +- package/dhcpcd/dhcpcd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash index 71d0e2861c..94ab89eae3 100644 --- a/package/dhcpcd/dhcpcd.hash +++ b/package/dhcpcd/dhcpcd.hash @@ -1,2 +1,2 @@ # Locally calculated from download (no sig, hash) -sha256 6089471ed695fa62ac8351466b96b4b6365fd14ec455a120a6524663808eae53 dhcpcd-6.9.3.tar.xz +sha256 c3f3ff7473ef158a1e71db9aea7424df2c3477ad064e2b542f27948a5abc9ba0 dhcpcd-6.9.4.tar.xz diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index 66928e2381..2d0cb0cd36 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCPCD_VERSION = 6.9.3 +DHCPCD_VERSION = 6.9.4 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd DHCPCD_DEPENDENCIES = host-pkgconf From 827bf7a24fdcf6be51fb2d2813d6d8123252905b Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Tue, 1 Dec 2015 09:52:22 +0100 Subject: [PATCH 128/132] openocd: bump to 0.9.0 Remove obsolete compilation error patch and update jimtcl related patch. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- ...tion-error-in-src-flash-nor-mini51.c.patch | 30 ------------------- ...configuration-to-force-static-librar.patch | 14 ++------- package/openocd/openocd.hash | 6 ++-- package/openocd/openocd.mk | 4 +-- 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 package/openocd/0001-Fix-compilation-error-in-src-flash-nor-mini51.c.patch diff --git a/package/openocd/0001-Fix-compilation-error-in-src-flash-nor-mini51.c.patch b/package/openocd/0001-Fix-compilation-error-in-src-flash-nor-mini51.c.patch deleted file mode 100644 index 6eb7f9d34e..0000000000 --- a/package/openocd/0001-Fix-compilation-error-in-src-flash-nor-mini51.c.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 893330638a26ea2868c6e7606047acf9b6fe31ea Mon Sep 17 00:00:00 2001 -From: Claudio Laurita -Date: Sun, 30 Nov 2014 17:30:36 +0100 -Subject: [PATCH 1/1] Fix compilation error in src/flash/nor/mini51.c - -0001-Fix-compilation-error-in-src-flash-nor-mini51.c.patch -gcc complains about missing initialization of -local variable flash_size and compilation aborts - -Signed-off-by: Claudio Laurita ---- - src/flash/nor/mini51.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/flash/nor/mini51.c b/src/flash/nor/mini51.c -index 61aee5d..c7ba13a 100644 ---- a/src/flash/nor/mini51.c -+++ b/src/flash/nor/mini51.c -@@ -397,7 +397,7 @@ static int mini51_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t - - static int mini51_probe(struct flash_bank *bank) - { -- uint32_t flash_size; -+ uint32_t flash_size = 0; - int retval; - int num_pages; - uint32_t offset = 0; --- -2.1.3 - diff --git a/package/openocd/0002-Fix-jimtcl-auto-configuration-to-force-static-librar.patch b/package/openocd/0002-Fix-jimtcl-auto-configuration-to-force-static-librar.patch index 5ec0552dd4..fd3cfa469a 100644 --- a/package/openocd/0002-Fix-jimtcl-auto-configuration-to-force-static-librar.patch +++ b/package/openocd/0002-Fix-jimtcl-auto-configuration-to-force-static-librar.patch @@ -7,15 +7,10 @@ Subject: [PATCH 2/2] Fix jimtcl auto configuration to force static library option in buildroot project. Signed-off-by: Claudio Laurita ---- - jimtcl/auto.def | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) -diff --git a/jimtcl/auto.def b/jimtcl/auto.def -index ddb0c1e..929ade0 100644 --- a/jimtcl/auto.def +++ b/jimtcl/auto.def -@@ -181,12 +181,8 @@ if {[opt-bool references]} { +@@ -194,12 +194,8 @@ msg-result "Enabling references" define JIM_REFERENCES } @@ -27,9 +22,6 @@ index ddb0c1e..929ade0 100644 -} +msg-result "Building static library" +define JIM_STATICLIB + define LIBSOEXT [format [get-define SH_SOEXTVER] [format %.2f [expr {[get-define JIM_VERSION] / 100.0}]]] define JIM_INSTALL [opt-bool install-jim] - - # Attributes of the extensions --- -2.1.3 - + define JIM_DOCS [opt-bool docs] diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash index bc5c8c0d0c..4ca11e206e 100644 --- a/package/openocd/openocd.hash +++ b/package/openocd/openocd.hash @@ -1,3 +1,3 @@ -# From http://sourceforge.net/projects/openocd/files/openocd/0.8.0/ -sha1 10bf9eeb54e03083cb1a101785b2d69fbdf18f31 openocd-0.8.0.tar.bz2 -md5 6d83c34763a5f1d1ac7ad83c5a11f4fb openocd-0.8.0.tar.bz2 +# From http://sourceforge.net/projects/openocd/files/openocd/0.9.0/ +sha1 bcf99bb21f09513065b2c9ece148ace7d16cdd0c openocd-0.9.0.tar.bz2 +md5 665cc98ae9e7297e09ec6ac7235fee49 openocd-0.9.0.tar.bz2 diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 3b7685061b..21a302ff25 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -4,9 +4,9 @@ # ################################################################################ -OPENOCD_VERSION = 0.8.0 +OPENOCD_VERSION = 0.9.0 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2 -OPENOCD_SITE = http://downloads.sourceforge.net/project/openocd/openocd/$(OPENOCD_VERSION) +OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION) OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" From 3f1c58f64cde17beea3d9f246b6a4bea411def12 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 1 Dec 2015 10:52:46 -0300 Subject: [PATCH 129/132] cryptodev-linux: bump to version 1.8 Patches are upstream so remove them. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- ...1-fix-compilation-against-linux-3.19.patch | 37 ------------------- package/cryptodev-linux/cryptodev-linux.hash | 2 +- package/cryptodev-linux/cryptodev-linux.mk | 2 +- 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 package/cryptodev-linux/0001-fix-compilation-against-linux-3.19.patch diff --git a/package/cryptodev-linux/0001-fix-compilation-against-linux-3.19.patch b/package/cryptodev-linux/0001-fix-compilation-against-linux-3.19.patch deleted file mode 100644 index aebbc9b595..0000000000 --- a/package/cryptodev-linux/0001-fix-compilation-against-linux-3.19.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5054d20d45571cc85339351fde52f872eeb82206 Mon Sep 17 00:00:00 2001 -From: Phil Sutter -Date: Tue, 10 Feb 2015 04:57:05 +0100 -Subject: [PATCH] fix compilation against linux-3.19 - -Commit f938612dd97d481b8b5bf960c992ae577f081c17 in linux.git removes -get_unused_fd() macro. This patch changes the calling code to use it's -content 'get_unused_fd_flags(0)' instead. Checking for when -get_unused_fd_flags was introduced shows it's been there since 2.6.23 at -least, so probably no need to make this change conditional on the target -kernel version. - -Original patch by Ricardo Ribalda Delgado for Open Embedded, reported by -Oleg Rakhmanov. - -Signed-off-by: Phil Sutter -Signed-off-by: Gustavo Zacarias ---- - ioctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ioctl.c b/ioctl.c -index 5a55a76..b23f5fd 100644 ---- a/ioctl.c -+++ b/ioctl.c -@@ -546,7 +546,7 @@ static int - clonefd(struct file *filp) - { - int ret; -- ret = get_unused_fd(); -+ ret = get_unused_fd_flags(0); - if (ret >= 0) { - get_file(filp); - fd_install(ret, filp); --- -2.0.5 - diff --git a/package/cryptodev-linux/cryptodev-linux.hash b/package/cryptodev-linux/cryptodev-linux.hash index d5e0bae44c..d7195ac6f8 100644 --- a/package/cryptodev-linux/cryptodev-linux.hash +++ b/package/cryptodev-linux/cryptodev-linux.hash @@ -1,2 +1,2 @@ # Locally calculated after checking php signature -sha256 41880533b53de4d7b3f054e230f576988dafb8eed7bef5ebcf6422bb2e3a3b25 cryptodev-linux-1.7.tar.gz +sha256 67fabde9fb67b286a96c4f45b594b0eccd0f761b495705c18f2ae9461b831376 cryptodev-linux-1.8.tar.gz diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk index 6001c71921..c3f5355345 100644 --- a/package/cryptodev-linux/cryptodev-linux.mk +++ b/package/cryptodev-linux/cryptodev-linux.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRYPTODEV_LINUX_VERSION = 1.7 +CRYPTODEV_LINUX_VERSION = 1.8 CRYPTODEV_LINUX_SITE = http://download.gna.org/cryptodev-linux CRYPTODEV_LINUX_INSTALL_STAGING = YES CRYPTODEV_LINUX_LICENSE = GPLv2+ From 8c088c6d5402d898af23016b56c734e9c82fc2f6 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 1 Dec 2015 10:42:12 +0000 Subject: [PATCH 130/132] openldap: bump version to 2.4.43 - Bump version to 2.4.43 - Use md5 and sha1 upstream provided hashes. This combination is stronger than a sha256 hash. - Switch to an http download site to avoid problems with firewalls blocking the ftp. Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/openldap/openldap.hash | 8 ++++---- package/openldap/openldap.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/openldap/openldap.hash b/package/openldap/openldap.hash index cca1e38b90..83e790f77e 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.41.sha1 -sha1 c6880df9fec928a5f010b78a4285b497e8a12d6b openldap-2.4.41.tgz -# Locally computed: -sha256 27856bb4a8b44feca2b326c309000e16a9dadd52362c8ab6eec6c67a43737f6e openldap-2.4.41.tgz +# 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 diff --git a/package/openldap/openldap.mk b/package/openldap/openldap.mk index 4c3a71ab62..17bf991e25 100644 --- a/package/openldap/openldap.mk +++ b/package/openldap/openldap.mk @@ -4,9 +4,9 @@ # ################################################################################ -OPENLDAP_VERSION = 2.4.41 +OPENLDAP_VERSION = 2.4.43 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz -OPENLDAP_SITE = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release +OPENLDAP_SITE = http://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License OPENLDAP_LICENSE_FILES = LICENSE OPENLDAP_INSTALL_STAGING = YES From 3e280283b7d4f4a7f7bb17edeea84dbb4fe09383 Mon Sep 17 00:00:00 2001 From: Renaud AUBIN Date: Tue, 1 Dec 2015 13:15:19 +0100 Subject: [PATCH 131/132] libhttpparser: bump to 2.6.0 The http-parser repository has been transfered from joyent to nodejs. Bump version to 2.6.0. Signed-off-by: Renaud AUBIN Signed-off-by: Thomas Petazzoni --- ...option-when-calling-ln-at-install-time.patch | 17 +++++++++-------- package/libhttpparser/Config.in | 2 +- package/libhttpparser/libhttpparser.mk | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch b/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch index 29fe04defd..df166565f9 100644 --- a/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch +++ b/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch @@ -1,4 +1,4 @@ -From d9dfeca8736318eaad5cd4554cbae059469decde Mon Sep 17 00:00:00 2001 +From 384917321c45e492b0ca7aaa94d4b15324aef95d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 28 Aug 2015 19:02:11 +0200 Subject: [PATCH] Use -f option when calling ln at install time @@ -6,29 +6,30 @@ Subject: [PATCH] Use -f option when calling ln at install time This allows "make install; make install" to work properly. Signed-off-by: Thomas Petazzoni +Signed-off-by: Renaud AUBIN --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 373709c..6206b09 100644 +index 33c8ba0..b36d95a 100644 --- a/Makefile +++ b/Makefile -@@ -113,12 +113,12 @@ tags: http_parser.c http_parser.h test.c +@@ -125,12 +125,12 @@ tags: http_parser.c http_parser.h test.c install: library $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h $(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME) -- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so -+ ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so +- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) ++ ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) install-strip: library $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h $(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME) -- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so -+ ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so +- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) ++ ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) uninstall: rm $(INCLUDEDIR)/http_parser.h -- -2.5.0 +2.6.2 diff --git a/package/libhttpparser/Config.in b/package/libhttpparser/Config.in index 31b8b9b376..43563049e4 100644 --- a/package/libhttpparser/Config.in +++ b/package/libhttpparser/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_LIBHTTPPARSER 40 bytes of data per message stream (in a web server that is per connection). - https://github.com/joyent/http-parser + https://github.com/nodejs/http-parser comment "libhttpparser needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/libhttpparser/libhttpparser.mk b/package/libhttpparser/libhttpparser.mk index d6ec236650..015efc0a1d 100644 --- a/package/libhttpparser/libhttpparser.mk +++ b/package/libhttpparser/libhttpparser.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBHTTPPARSER_VERSION = v2.5.0 -LIBHTTPPARSER_SITE = $(call github,joyent,http-parser,$(LIBHTTPPARSER_VERSION)) +LIBHTTPPARSER_VERSION = v2.6.0 +LIBHTTPPARSER_SITE = $(call github,nodejs,http-parser,$(LIBHTTPPARSER_VERSION)) LIBHTTPPARSER_INSTALL_STAGING = YES LIBHTTPPARSER_LICENSE = MIT LIBHTTPPARSER_LICENSE_FILES = LICENSE-MIT From 01e3d2eff15eb2535c4c15eb4f62467a50fe6a5f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 30 Nov 2015 10:16:35 -0300 Subject: [PATCH 132/132] gnutls: bump to version 3.4.7 The 3.4 series has been promoted to stable. Handle autodeps more concisely (idn, p11-kit, zlib). libtasn1 is now mandatory, since otherwise gnutls uses the bundled version it makes no sense to try that because of target duplication. Disable tpm support since we've got no trousers package. Disable libdane support since we've got no dane package. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gnutls/Config.in | 1 + package/gnutls/gnutls.hash | 2 +- package/gnutls/gnutls.mk | 41 ++++++++++++++++++++++++++++---------- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index ecb6756d25..dde23cec7a 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_GNUTLS bool "gnutls" + select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_NETTLE select BR2_PACKAGE_PCRE depends on BR2_USE_WCHAR diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index b33c8385cb..f062041e83 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 888d8779b48f21959b33d4d9ad0b546e5ec3dea20abf0d9bb03869d56b1f44cf gnutls-3.3.19.tar.xz +sha256 c1be9e4b30295d7b5f96fa332c6a908e6fa2254377b67811301fca92eb882e5a gnutls-3.4.7.tar.xz diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 1ac3e4e6a4..3b9fc7fca7 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -4,24 +4,22 @@ # ################################################################################ -GNUTLS_VERSION_MAJOR = 3.3 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).19 +GNUTLS_VERSION_MAJOR = 3.4 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).7 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = GPLv3+ LGPLv2.1+ GNUTLS_LICENSE_FILES = COPYING COPYING.LESSER -GNUTLS_DEPENDENCIES = host-pkgconf nettle pcre \ - $(if $(BR2_PACKAGE_P11_KIT),p11-kit) \ - $(if $(BR2_PACKAGE_LIBIDN),libidn) \ - $(if $(BR2_PACKAGE_LIBTASN1),libtasn1) \ - $(if $(BR2_PACKAGE_ZLIB),zlib) +GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre GNUTLS_CONF_OPTS = \ - --with-libnettle-prefix=$(STAGING_DIR)/usr \ - --with-librt-prefix=$(STAGING_DIR) \ - --disable-rpath \ --disable-doc \ --disable-guile \ - --enable-local-libopts + --disable-libdane \ + --disable-rpath \ + --enable-local-libopts \ + --with-libnettle-prefix=$(STAGING_DIR)/usr \ + --with-librt-prefix=$(STAGING_DIR) \ + --without-tpm GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \ ac_cv_header_wchar_h=$(if $(BR2_USE_WCHAR),yes,no) \ gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) \ @@ -54,6 +52,27 @@ GNUTLS_CONF_OPTS += --enable-cryptodev GNUTLS_DEPENDENCIES += cryptodev-linux endif +ifeq ($(BR2_PACKAGE_LIBIDN),y) +GNUTLS_CONF_OPTS += --with-idn +GNUTLS_DEPENDENCIES += libidn +else +GNUTLS_CONF_OPTS += --without-idn +endif + +ifeq ($(BR2_PACKAGE_P11_KIT),y) +GNUTLS_CONF_OPTS += --with-p11-kit +GNUTLS_DEPENDENCIES += p11-kit +else +GNUTLS_CONF_OPTS += --without-p11-kit +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +GNUTLS_CONF_OPTS += --with-zlib +GNUTLS_DEPENDENCIES += zlib +else +GNUTLS_CONF_OPTS += --without-zlib +endif + # Some examples in doc/examples use wchar define GNUTLS_DISABLE_DOCS $(SED) 's/ doc / /' $(@D)/Makefile.in